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

[automerge] Fix the translation not work if the animation is off 2p: 880a59217d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17312465

Bug: 215386127
Change-Id: I21f5af8a13b89c2e68441cae002ee6b297bf051d
Merged-In: Id0d02c422100effcf842209971052f4d6e9b0bd2
This commit is contained in:
Presubmit Automerger Backend
2022-03-24 07:20:13 +00:00
parent 69b351e508 880a59217d
commit fd025bac1b
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/translation/UiTranslationManager.java
View File

@@ -101,26 +101,26 @@ public final class UiTranslationManager {
public static final String LOG_TAG = "UiTranslation"; public static final String LOG_TAG = "UiTranslation";
/** /**
* The state caller request to disable utranslation,, it is no longer need to ui translation. * The state the caller requests to enable UI translation.
* *
* @hide * @hide
*/ */
public static final int STATE_UI_TRANSLATION_STARTED = 0; public static final int STATE_UI_TRANSLATION_STARTED = 0;
/** /**
* The state caller request to pause ui translation, it will switch back to the original text. * The state caller requests to pause UI translation. It will switch back to the original text.
* *
* @hide * @hide
*/ */
public static final int STATE_UI_TRANSLATION_PAUSED = 1; public static final int STATE_UI_TRANSLATION_PAUSED = 1;
/** /**
* The state caller request to resume the paused ui translation, it will show the translated * The state caller requests to resume the paused UI translation. It will show the translated
* text again if the text had been translated. * text again if the text had been translated.
* *
* @hide * @hide
*/ */
public static final int STATE_UI_TRANSLATION_RESUMED = 2; public static final int STATE_UI_TRANSLATION_RESUMED = 2;
/** /**
* The state the caller request to enable ui translation. * The state the caller requests to disable UI translation when it no longer needs translation.
* *
* @hide * @hide
*/ */

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

@@ -89,7 +89,7 @@ public class TextViewTranslationCallback implements ViewTranslationCallback {
originalTranslationMethod); originalTranslationMethod);
} }
final TransformationMethod transformation = mTranslationTransformation; final TransformationMethod transformation = mTranslationTransformation;
runWithAnimation( runChangeTextWithAnimationIfNeeded(
(TextView) view, (TextView) view,
() -> { () -> {
mIsShowingTranslation = true; mIsShowingTranslation = true;
@@ -122,7 +122,7 @@ public class TextViewTranslationCallback implements ViewTranslationCallback {
if (mTranslationTransformation != null) { if (mTranslationTransformation != null) {
final TransformationMethod transformation = final TransformationMethod transformation =
mTranslationTransformation.getOriginalTransformationMethod(); mTranslationTransformation.getOriginalTransformationMethod();
runWithAnimation( runChangeTextWithAnimationIfNeeded(
(TextView) view, (TextView) view,
() -> { () -> {
mIsShowingTranslation = false; 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 * 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. * 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 * @param changeTextRunnable the operation to run on the view after the text is faded out, to
* displaying the original or translated text. * 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) { if (mAnimator != null) {
mAnimator.end(); mAnimator.end();
// Note: mAnimator is now null; do not use again here. // Note: mAnimator is now null; do not use again here.
@@ -269,7 +275,7 @@ public class TextViewTranslationCallback implements ViewTranslationCallback {
@Override @Override
public void onAnimationRepeat(Animator animation) { public void onAnimationRepeat(Animator animation) {
runnable.run(); changeTextRunnable.run();
} }
}); });
mAnimator.start(); mAnimator.start();