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

Merge "Fix translation doesn't work on ViewGroup" into sc-qpr1-dev

Browse Source
This commit is contained in:
Joanne Chung
2021-09-23 06:15:01 +00:00
committed by Android (Google) Code Review
parent f3d3be5260 ec3f41e70e
commit f0c99d831e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -598,9 +598,8 @@ public class UiTranslationController {
final View rootView = roots.get(rootNum).getView(); final View rootView = roots.get(rootNum).getView();
if (rootView instanceof ViewGroup) { if (rootView instanceof ViewGroup) {
findViewsTraversalByAutofillIds((ViewGroup) rootView, sourceViewIds); findViewsTraversalByAutofillIds((ViewGroup) rootView, sourceViewIds);
} else {
addViewIfNeeded(sourceViewIds, rootView);
} }
addViewIfNeeded(sourceViewIds, rootView);
} }
} }
@@ -611,9 +610,8 @@ public class UiTranslationController {
final View child = viewGroup.getChildAt(i); final View child = viewGroup.getChildAt(i);
if (child instanceof ViewGroup) { if (child instanceof ViewGroup) {
findViewsTraversalByAutofillIds((ViewGroup) child, sourceViewIds); findViewsTraversalByAutofillIds((ViewGroup) child, sourceViewIds);
} else {
addViewIfNeeded(sourceViewIds, child);
} }
addViewIfNeeded(sourceViewIds, child);
} }
} }