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

Commit 804a1c3c authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix not show translation if call startTranslation after... 

Merge "Fix not show translation if call startTranslation after pauseTranslation" into sc-qpr1-dev am: e82a38a8 am: d8b714a0

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

Change-Id: I8ded71f8811d8d95f7e39c4fa7d4f3177f0ffb3a
parents 1bb59160 d8b714a0

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

+9 −5
Original line number Diff line number Diff line
@@ -426,15 +426,19 @@ public class UiTranslationController { 
                    continue;

                }

                mActivity.runOnUiThread(() -> {

                    ViewTranslationCallback callback = view.getViewTranslationCallback();

                    if (view.getViewTranslationResponse() != null

                            && view.getViewTranslationResponse().equals(response)) {

                        if (callback instanceof TextViewTranslationCallback) {

                            if (((TextViewTranslationCallback) callback).isShowingTranslation()) {

                                if (DEBUG) {

                                    Log.d(TAG, "Duplicate ViewTranslationResponse for " + autofillId

                                            + ". Ignoring.");

                                }

                                return;

                            }

                    ViewTranslationCallback callback = view.getViewTranslationCallback();

                        }

                    }

                    if (callback == null) {

                        if (view instanceof TextView) {

                            // developer doesn't provide their override, we set the default TextView

core/java/android/widget/TextViewTranslationCallback.java

+7 −1
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ public class TextViewTranslationCallback implements ViewTranslationCallback { 
     */

    @Override

    public boolean onShowTranslation(@NonNull View view) {

        if (mIsShowingTranslation) {

            if (DEBUG) {

                Log.d(TAG, view + " is already showing translated text.");

            }

            return false;

        }

        ViewTranslationResponse response = view.getViewTranslationResponse();

        if (response == null) {

            Log.e(TAG, "onShowTranslation() shouldn't be called before "
@@ -152,7 +158,7 @@ public class TextViewTranslationCallback implements ViewTranslationCallback { 
        return true;

    }



    boolean isShowingTranslation() {

    public boolean isShowingTranslation() {

        return mIsShowingTranslation;

    }