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 am: f0c99d831e

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

Change-Id: Iee14d5c5858cbfd773469b43d1d94d8639fe09d7
This commit is contained in:
Joanne Chung
2021-09-23 06:27:58 +00:00
committed by Automerger Merge Worker
parent cf15e37633 f0c99d831e
commit dedd68e52e
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);
} }
} }