Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64f6b760 authored by Joanne Chung's avatar Joanne Chung
Browse files

Fix showing translated text if user switch back to original lauguage quickly. 

Fixes the bug if the translation service spending more time to deal
with the translation but user switches back to original lauguage
quickly, we will show translated text.

When the response back, if the translation state is finished, we drop
the result. If the state is pause, we update the response but we do
not call onShowTranslation to translated text.

Bug: 200251777
Test: atest CtsTranslationTestCases
Test: manual. Try to send request late and switch back original
language, it keeps original. Then it works fine when switch between
the source and target languages.

Change-Id: I780456f091884c61e5801ead3ff021531fee87b4
parent 8316f682

core/java/android/view/translation/UiTranslationController.java

+9 −1
Original line number Diff line number Diff line
@@ -369,6 +369,10 @@ public class UiTranslationController { 
                    Log.v(TAG, "onVirtualViewTranslationCompleted: received response for "

                            + "AutofillId " + autofillId);

                }

                view.onVirtualViewTranslationResponses(virtualChildResponse);

                if (mCurrentState == STATE_UI_TRANSLATION_PAUSED) {

                    return;

                }

                mActivity.runOnUiThread(() -> {

                    if (view.getViewTranslationCallback() == null) {

                        if (DEBUG) {
@@ -377,7 +381,6 @@ public class UiTranslationController { 
                        }

                        return;

                    }

                    view.onVirtualViewTranslationResponses(virtualChildResponse);

                    if (view.getViewTranslationCallback() != null) {

                        view.getViewTranslationCallback().onShowTranslation(view);

                    }
@@ -425,6 +428,8 @@ public class UiTranslationController { 
                            + " may be gone.");

                    continue;

                }

                int currentState;

                currentState = mCurrentState;

                mActivity.runOnUiThread(() -> {

                    ViewTranslationCallback callback = view.getViewTranslationCallback();

                    if (view.getViewTranslationResponse() != null
@@ -458,6 +463,9 @@ public class UiTranslationController { 
                        callback.enableContentPadding();

                    }

                    view.onViewTranslationResponse(response);

                    if (currentState == STATE_UI_TRANSLATION_PAUSED) {

                        return;

                    }

                    callback.onShowTranslation(view);

                });

            }