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

Commit aa1d03ea authored Jun 14, 2021 by TreeHugger Robot Committed by Automerger Merge Worker Jun 14, 2021

Merge "Clear the ViewTranslationResponse on finishing UiTranslation." into...

Merge "Clear the ViewTranslationResponse on finishing UiTranslation." into sc-dev am: 2828678b am: 6cda59d4

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

Change-Id: Id267fa0be2b6ca9237cb57b5a4651379bb14f41c

parents e44459f7 6cda59d4

core/java/android/view/View.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -30928,6 +30928,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		mViewTranslationResponse = response;
		}

		/**
		* Clears the ViewTranslationResponse stored by the default implementation of {@link
		* #onViewTranslationResponse}.
		*
		* @hide
		*/
		public void clearViewTranslationResponse() {
		mViewTranslationResponse = null;
		}

		/**
		* Called when the content from {@link View#onCreateVirtualViewTranslationRequests} had been
		* translated by the TranslationService.

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@ public class UiTranslationController {
		destroyTranslators();
		runForEachView((view, callback) -> {
		callback.onClearTranslation(view);
		view.clearViewTranslationResponse();
		if (view.hasTranslationTransientState()) {
		view.setHasTransientState(false);
		view.setHasTranslationTransientState(false);