diff --git a/core/api/current.txt b/core/api/current.txt index 184d3cf15dd1c..cb61bbc746e55 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -48544,6 +48544,7 @@ package android.view { method public android.view.WindowInsets dispatchApplyWindowInsets(android.view.WindowInsets); method public boolean dispatchCapturedPointerEvent(android.view.MotionEvent); method public void dispatchConfigurationChanged(android.content.res.Configuration); + method public void dispatchCreateViewTranslationRequest(@NonNull java.util.Map, @NonNull int[], @NonNull android.view.translation.TranslationCapability, @NonNull java.util.List); method public void dispatchDisplayHint(int); method public boolean dispatchDragEvent(android.view.DragEvent); method protected void dispatchDraw(android.graphics.Canvas); @@ -48565,7 +48566,6 @@ package android.view { method public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent); method public void dispatchProvideAutofillStructure(@NonNull android.view.ViewStructure, int); method public void dispatchProvideStructure(android.view.ViewStructure); - method public void dispatchRequestTranslation(@NonNull java.util.Map, @NonNull int[], @NonNull android.view.translation.TranslationCapability, @NonNull java.util.List); method protected void dispatchRestoreInstanceState(android.util.SparseArray); method protected void dispatchSaveInstanceState(android.util.SparseArray); method public void dispatchScrollCaptureSearch(@NonNull android.graphics.Rect, @NonNull android.graphics.Point, @NonNull java.util.function.Consumer); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index e0c26cb0e5f01..acc0fc178d6e6 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -30876,7 +30876,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * Called when the content from {@link View#onCreateViewTranslationRequest} had been translated - * by the TranslationService. + * by the TranslationService. The {@link ViewTranslationResponse} should be saved here so that + * the {@link ViewTranslationResponse} can be used to display the translation when the system + * calls {@link ViewTranslationCallback#onShowTranslation}. * *

The default implementation will set the ViewTranslationResponse that can be get from * {@link View#getViewTranslationResponse}.

@@ -30929,7 +30931,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * information, e.g. source spec, target spec. * @param requests fill in with {@link ViewTranslationRequest}s for translation purpose. */ - public void dispatchRequestTranslation(@NonNull Map viewIds, + public void dispatchCreateViewTranslationRequest(@NonNull Map viewIds, @NonNull @DataFormat int[] supportedFormats, @NonNull TranslationCapability capability, @NonNull List requests) { diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index a02281be12285..4647f472f2a27 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -9275,21 +9275,23 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * {@inheritDoc} * - * The implementation calls {@link #dispatchRequestTranslation} for all the child views. + * The implementation calls {@link #dispatchCreateViewTranslationRequest} for all the child + * views. */ @Override - public void dispatchRequestTranslation(@NonNull Map viewIds, + public void dispatchCreateViewTranslationRequest(@NonNull Map viewIds, @NonNull @DataFormat int[] supportedFormats, @Nullable TranslationCapability capability, @NonNull List requests) { - super.dispatchRequestTranslation(viewIds, supportedFormats, capability, requests); + super.dispatchCreateViewTranslationRequest(viewIds, supportedFormats, capability, requests); final int childCount = getChildCount(); if (childCount == 0) { return; } for (int i = 0; i < childCount; ++i) { final View child = getChildAt(i); - child.dispatchRequestTranslation(viewIds, supportedFormats, capability, requests); + child.dispatchCreateViewTranslationRequest(viewIds, supportedFormats, capability, + requests); } } } diff --git a/core/java/android/view/translation/UiTranslationController.java b/core/java/android/view/translation/UiTranslationController.java index 8a2b629b53cd0..e0526f87340a5 100644 --- a/core/java/android/view/translation/UiTranslationController.java +++ b/core/java/android/view/translation/UiTranslationController.java @@ -466,8 +466,8 @@ public class UiTranslationController { // traverse the hierarchy to collect ViewTranslationRequests for (int rootNum = 0; rootNum < roots.size(); rootNum++) { View rootView = roots.get(rootNum).getView(); - rootView.dispatchRequestTranslation(viewIds, supportedFormats, capability, - requests); + rootView.dispatchCreateViewTranslationRequest(viewIds, supportedFormats, + capability, requests); } mWorkerHandler.sendMessage(PooledLambda.obtainMessage( UiTranslationController::sendTranslationRequest,