Merge "Invalidate TextView after locale change" into nyc-dev

am: 1a08865

* commit '1a08865d1fed6634746e7ca19cdd30e028681fb1':
  Invalidate TextView after locale change

Change-Id: Ic3c82bd2fc0553354e1ea8fc9cfcda7a3d565fc0
This commit is contained in:
Roozbeh Pournader
2016-03-31 19:43:08 +00:00
committed by android-build-merger

View File

@@ -2893,6 +2893,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
public void setTextLocale(@NonNull Locale locale) {
mLocalesChanged = true;
mTextPaint.setTextLocale(locale);
if (mLayout != null) {
nullLayouts();
requestLayout();
invalidate();
}
}
/**
@@ -2909,6 +2914,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
public void setTextLocales(@NonNull @Size(min=1) LocaleList locales) {
mLocalesChanged = true;
mTextPaint.setTextLocales(locales);
if (mLayout != null) {
nullLayouts();
requestLayout();
invalidate();
}
}
@Override
@@ -2916,6 +2926,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
super.onConfigurationChanged(newConfig);
if (!mLocalesChanged) {
mTextPaint.setTextLocales(LocaleList.getDefault());
if (mLayout != null) {
nullLayouts();
requestLayout();
invalidate();
}
}
}