Merge changes Ia693f512,If3b7d41f (06136574) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -10067,6 +10067,7 @@ package android.graphics {
		method public android.graphics.Xfermode getXfermode();
		method public final boolean isAntiAlias();
		method public final boolean isDither();
		method public boolean isElegantTextHeight();
		method public final boolean isFakeBoldText();
		method public final boolean isFilterBitmap();
		method public final boolean isLinearText();
		@@ -10085,6 +10086,7 @@ package android.graphics {
		method public void setColor(int);
		method public android.graphics.ColorFilter setColorFilter(android.graphics.ColorFilter);
		method public void setDither(boolean);
		method public void setElegantTextHeight(boolean);
		method public void setFakeBoldText(boolean);
		method public void setFilterBitmap(boolean);
		method public void setFlags(int);
		@@ -34966,6 +34968,7 @@ package android.widget {
		method public void setCursorVisible(boolean);
		method public void setCustomSelectionActionModeCallback(android.view.ActionMode.Callback);
		method public final void setEditableFactory(android.text.Editable.Factory);
		method public void setElegantTextHeight(boolean);
		method public void setEllipsize(android.text.TextUtils.TruncateAt);
		method public void setEms(int);
		method public void setError(java.lang.CharSequence);

core/java/android/widget/TextView.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -652,6 +652,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		boolean allCaps = false;
		int shadowcolor = 0;
		float dx = 0, dy = 0, r = 0;
		boolean elegant = false;

		final Resources.Theme theme = context.getTheme();

		@@ -728,6 +729,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		case com.android.internal.R.styleable.TextAppearance_shadowRadius:
		r = appearance.getFloat(attr, 0);
		break;

		case com.android.internal.R.styleable.TextAppearance_elegantTextHeight:
		elegant = appearance.getBoolean(attr, false);
		break;
		}
		}

		@@ -1065,6 +1070,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		case com.android.internal.R.styleable.TextView_textAllCaps:
		allCaps = a.getBoolean(attr, false);
		break;

		case com.android.internal.R.styleable.TextView_elegantTextHeight:
		elegant = a.getBoolean(attr, false);
		break;
		}
		}
		a.recycle();
		@@ -1245,6 +1254,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		setHighlightColor(textColorHighlight);
		}
		setRawTextSize(textSize);
		setElegantTextHeight(elegant);

		if (allCaps) {
		setTransformationMethod(new AllCapsTransformationMethod(getContext()));
		@@ -2468,6 +2478,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		setTransformationMethod(new AllCapsTransformationMethod(getContext()));
		}

		if (appearance.hasValue(com.android.internal.R.styleable.TextAppearance_elegantTextHeight)) {
		setElegantTextHeight(appearance.getBoolean(
		com.android.internal.R.styleable.TextAppearance_elegantTextHeight, false));
		}

		appearance.recycle();
		}

		@@ -2614,6 +2629,17 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return mTextPaint.getTypeface();
		}

		/**
		* Set the TextView's elegant height metrics flag. This setting selects font
		* variants that have not been compacted to fit Latin-based vertical
		* metrics, and also increases top and bottom bounds to provide more space.
		*
		* @param elegant set the paint's elegant metrics flag.
		*/
		public void setElegantTextHeight(boolean elegant) {
		mTextPaint.setElegantTextHeight(elegant);
		}

		/**
		* Sets the text color for all the states (normal, selected,
		* focused) to be this color.

core/jni/android/graphics/Paint.cpp

+42 −2

Original line number	Diff line number	Diff line
		@@ -357,6 +357,24 @@ public:
		obj->setPaintOptionsAndroid(paintOpts);
		}

		static jboolean isElegantTextHeight(JNIEnv* env, jobject paint) {
		NPE_CHECK_RETURN_ZERO(env, paint);
		SkPaint* obj = GraphicsJNI::getNativePaint(env, paint);
		SkPaintOptionsAndroid paintOpts = obj->getPaintOptionsAndroid();
		return paintOpts.getFontVariant() == SkPaintOptionsAndroid::kElegant_Variant;
		}

		static void setElegantTextHeight(JNIEnv* env, jobject paint, jboolean aa) {
		NPE_CHECK_RETURN_VOID(env, paint);
		SkPaint* obj = GraphicsJNI::getNativePaint(env, paint);
		SkPaintOptionsAndroid::FontVariant variant =
		aa ? SkPaintOptionsAndroid::kElegant_Variant :
		SkPaintOptionsAndroid::kDefault_Variant;
		SkPaintOptionsAndroid paintOpts = obj->getPaintOptionsAndroid();
		paintOpts.setFontVariant(variant);
		obj->setPaintOptionsAndroid(paintOpts);
		}

		static jfloat getTextSize(JNIEnv* env, jobject paint) {
		NPE_CHECK_RETURN_ZERO(env, paint);
		return SkScalarToFloat(GraphicsJNI::getNativePaint(env, paint)->getTextSize());
		@@ -401,10 +419,30 @@ public:
		return SkScalarToFloat(metrics.fDescent);
		}

		static SkScalar getMetricsInternal(SkPaint paint, SkPaint::FontMetrics metrics) {
		const int kElegantTop = 2500;
		const int kElegantBottom = -1000;
		const int kElegantAscent = 1946;
		const int kElegantDescent = -512;
		const int kElegantLeading = 0;
		SkScalar spacing = paint->getFontMetrics(metrics);
		SkPaintOptionsAndroid paintOpts = paint->getPaintOptionsAndroid();
		if (paintOpts.getFontVariant() == SkPaintOptionsAndroid::kElegant_Variant) {
		SkScalar size = paint->getTextSize();
		metrics->fTop = -size * kElegantTop / 2048;
		metrics->fBottom = -size * kElegantBottom / 2048;
		metrics->fAscent = -size * kElegantAscent / 2048;
		metrics->fDescent = -size * kElegantDescent / 2048;
		metrics->fLeading = size * kElegantLeading / 2048;
		spacing = metrics->fDescent - metrics->fAscent + metrics->fLeading;
		}
		return spacing;
		}

		static jfloat getFontMetrics(JNIEnv* env, jobject paint, jobject metricsObj) {
		NPE_CHECK_RETURN_ZERO(env, paint);
		SkPaint::FontMetrics metrics;
		SkScalar spacing = GraphicsJNI::getNativePaint(env, paint)->getFontMetrics(&metrics);
		SkScalar spacing = getMetricsInternal(GraphicsJNI::getNativePaint(env, paint), &metrics);

		if (metricsObj) {
		SkASSERT(env->IsInstanceOf(metricsObj, gFontMetrics_class));
		@@ -421,7 +459,7 @@ public:
		NPE_CHECK_RETURN_ZERO(env, paint);
		SkPaint::FontMetrics metrics;

		GraphicsJNI::getNativePaint(env, paint)->getFontMetrics(&metrics);
		getMetricsInternal(GraphicsJNI::getNativePaint(env, paint), &metrics);
		int ascent = SkScalarRoundToInt(metrics.fAscent);
		int descent = SkScalarRoundToInt(metrics.fDescent);
		int leading = SkScalarRoundToInt(metrics.fLeading);
		@@ -894,6 +932,8 @@ static JNINativeMethod methods[] = {
		{"native_getTextAlign","(J)I", (void*) SkPaintGlue::getTextAlign},
		{"native_setTextAlign","(JI)V", (void*) SkPaintGlue::setTextAlign},
		{"native_setTextLocale","(JLjava/lang/String;)V", (void*) SkPaintGlue::setTextLocale},
		{"isElegantTextHeight","()Z", (void*) SkPaintGlue::isElegantTextHeight},
		{"setElegantTextHeight","(Z)V", (void*) SkPaintGlue::setElegantTextHeight},
		{"getTextSize","()F", (void*) SkPaintGlue::getTextSize},
		{"setTextSize","(F)V", (void*) SkPaintGlue::setTextSize},
		{"getTextScaleX","()F", (void*) SkPaintGlue::getTextScaleX},

core/res/res/values/attrs.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -3428,6 +3428,8 @@
		<attr name="shadowDy" format="float" />
		<!-- Radius of the shadow. -->
		<attr name="shadowRadius" format="float" />
		<!-- Elegant text height, especially for less compacted complex script text. -->
		<attr name="elegantTextHeight" format="boolean" />
		</declare-styleable>
		<declare-styleable name="TextClock">
		<!-- Specifies the formatting pattern used to show the time and/or date
		@@ -3719,6 +3721,8 @@
		<attr name="textIsSelectable" />
		<!-- Present the text in ALL CAPS. This may use a small-caps form when available. -->
		<attr name="textAllCaps" />
		<!-- Elegant text height, especially for less compacted complex script text. -->
		<attr name="elegantTextHeight" />
		</declare-styleable>
		<declare-styleable name="TextViewAppearance">
		<!-- Base text color, typeface, size, and style. -->

core/res/res/values/styles_quantum.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ please see styles_device_defaults.xml.
		<item name="textColorLink">?textColorLink</item>
		<item name="textSize">@dimen/text_size_body_1_quantum</item>
		<item name="fontFamily">@string/font_family_body_1_quantum</item>
		<item name="elegantTextHeight">true</item>
		</style>

		<style name="TextAppearance.Quantum.Display4">