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

Merge "Fix the translation not work if the animation is off" into tm-dev

Browse Source
This commit is contained in:
Joanne Chung
2022-03-24 13:15:40 +00:00
committed by Android (Google) Code Review
parent 8eb1c121b6 fe6fddb4f0
commit 8121a43efd
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/widget/TextViewTranslationCallback.java
View File

@@ -89,7 +89,7 @@ public class TextViewTranslationCallback implements ViewTranslationCallback {
originalTranslationMethod);
}
final TransformationMethod transformation = mTranslationTransformation;
runWithAnimation(
runChangeTextWithAnimationIfNeeded(
(TextView) view,
() -> {
mIsShowingTranslation = true;
@@ -122,7 +122,7 @@ public class TextViewTranslationCallback implements ViewTranslationCallback {
if (mTranslationTransformation != null) {
final TransformationMethod transformation =
mTranslationTransformation.getOriginalTransformationMethod();
runWithAnimation(
runChangeTextWithAnimationIfNeeded(
(TextView) view,
() -> {
mIsShowingTranslation = false;
@@ -232,10 +232,16 @@ public class TextViewTranslationCallback implements ViewTranslationCallback {
* Applies a simple text alpha animation when toggling between original and translated text. The
* text is fully faded out, then swapped to the new text, then the fading is reversed.
*
* @param runnable the operation to run on the view after the text is faded out, to change to
* displaying the original or translated text.
* @param changeTextRunnable the operation to run on the view after the text is faded out, to
* change to displaying the original or translated text.
*/
private void runWithAnimation(TextView view, Runnable runnable) {
private void runChangeTextWithAnimationIfNeeded(TextView view, Runnable changeTextRunnable) {
boolean areAnimatorsEnabled = ValueAnimator.areAnimatorsEnabled();
if (!areAnimatorsEnabled) {
// The animation is disabled, just change display text
changeTextRunnable.run();
return;
}
if (mAnimator != null) {
mAnimator.end();
// Note: mAnimator is now null; do not use again here.
@@ -269,7 +275,7 @@ public class TextViewTranslationCallback implements ViewTranslationCallback {
@Override
public void onAnimationRepeat(Animator animation) {
runnable.run();
changeTextRunnable.run();
}
});
mAnimator.start();