Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix pass null TranslationCapability to dispatchRequestTranslation()" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-29 10:29:56 +00:00
committed by Android (Google) Code Review
parent d462813702 be4bdf0a11
commit 00ea5427b6
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/translation/Translator.java
View File

@@ -253,6 +253,11 @@ public class Translator {
}
}
/** @hide */
public TranslationContext getTranslationContext() {
return mTranslationContext;
}
/** @hide */
public int getTranslatorId() {
return mId;

16
core/java/android/view/translation/UiTranslationController.java
View File

@@ -451,13 +451,14 @@ public class UiTranslationController {
int[] supportedFormats = getSupportedFormatsLocked();
ArrayList<ViewRootImpl> roots =
WindowManagerGlobal.getInstance().getRootViews(mActivity.getActivityToken());
TranslationCapability capability =
getTranslationCapability(translator.getTranslationContext());
mActivity.runOnUiThread(() -> {
// traverse the hierarchy to collect ViewTranslationRequests
for (int rootNum = 0; rootNum < roots.size(); rootNum++) {
View rootView = roots.get(rootNum).getView();
// TODO(b/183589662): call getTranslationCapabilities() for capability
rootView.dispatchRequestTranslation(viewIds, supportedFormats, /* capability */
null, requests);
rootView.dispatchRequestTranslation(viewIds, supportedFormats, capability,
requests);
}
mWorkerHandler.sendMessage(PooledLambda.obtainMessage(
UiTranslationController::sendTranslationRequest,
@@ -487,6 +488,15 @@ public class UiTranslationController {
return new int[] {TranslationSpec.DATA_FORMAT_TEXT};
}
private TranslationCapability getTranslationCapability(TranslationContext translationContext) {
// We only support text to text capability now, we will query real status from service when
// we support more translation capabilities.
return new TranslationCapability(TranslationCapability.STATE_ON_DEVICE,
translationContext.getSourceSpec(),
translationContext.getTargetSpec(), /* uiTranslationEnabled= */ true,
/* supportedTranslationFlags= */ 0);
}
private void findViewsTraversalByAutofillIds(IntArray sourceViewIds) {
final ArrayList<ViewRootImpl> roots =
WindowManagerGlobal.getInstance().getRootViews(mActivity.getActivityToken());