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

Commit 5707812e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7809314 from e82a38a8 to sc-qpr1-d-release

Change-Id: I6fa7cbf7297d5068adfb9a4b8a7c6f2b7416e8d0
parents 11dd2697 e82a38a8
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
@@ -431,15 +431,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
+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;
    }