Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Introduce set/getFontVariationSettings.""

Browse Source
This commit is contained in:
Siyamed Sinir
2017-01-20 01:59:47 +00:00
committed by Android (Google) Code Review
parent 5bb4c96d43 a3b9f2e3c6
commit 24fac986ec
17 changed files with 84 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/java/android/widget/TextView.java
View File

@@ -3256,20 +3256,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return mTextPaint.getFontFeatureSettings();
}
/**
* Returns the font variation settings.
*
* @return the currently set font variation settings. Returns null if no variation is
* specified.
*
* @see #setFontVariationSettings(String)
* @see Paint#setFontVariationSettings(String) Paint.setFontVariationSettings(String)
*/
@Nullable
public String getFontVariationSettings() {
return mTextPaint.getFontVariationSettings();
}
/**
* Sets the break strategy for breaking paragraphs into lines. The default value for
* TextView is {@link Layout#BREAK_STRATEGY_HIGH_QUALITY}, and the default value for
@@ -3376,41 +3362,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
/**
* Sets TrueType or OpenType font variation settings. The settings string is constructed from
* multiple pairs of axis tag and style values. The axis tag must contain four ASCII characters
* and must be wrapped with single quotes (U+0027) or double quotes (U+0022). Axis strings that
* are longer or shorter than four characters, or contain characters outside of U+0020..U+007E
* are invalid. If a specified axis name is not defined in the font, the settings will be
* ignored.
*
* <pre>
* textView.setFontVariationSettings("'wdth' 1.0");
* textView.setFontVariationSettings("'AX ' 1.8, 'FB ' 2.0");
* </pre>
*
* @param fontVariationSettings font variation settings. You can pass null or empty string as
* no variation settings.
*
* @see #getFontVariationSettings()
* @see Paint#getFontVariationSettings() Paint.getFontVariationSettings()
*/
public void setFontVariationSettings(@Nullable String fontVariationSettings) {
final String existingSettings = mTextPaint.getFontVariationSettings();
if (fontVariationSettings == existingSettings
|| (fontVariationSettings != null
&& fontVariationSettings.equals(existingSettings))) {
return;
}
mTextPaint.setFontVariationSettings(fontVariationSettings);
if (mLayout != null) {
nullLayouts();
requestLayout();
invalidate();
}
}
/**
* Sets the text color for all the states (normal, selected,
* focused) to be this color.