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

Commit 1ebf71e4 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

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

Merge "Fix translation doesn't work on ViewGroup" into sc-qpr1-dev am: f0c99d83 am: dedd68e5 am: 30a84e50

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

Change-Id: I1265a0f30193dcd833357a96dddc6b339c166121
parents a021fed9 30a84e50

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

+2 −4
Original line number Diff line number Diff line
@@ -592,9 +592,8 @@ public class UiTranslationController { 
            final View rootView = roots.get(rootNum).getView();

            if (rootView instanceof ViewGroup) {

                findViewsTraversalByAutofillIds((ViewGroup) rootView, sourceViewIds);

            } else {

                addViewIfNeeded(sourceViewIds, rootView);

            }

            addViewIfNeeded(sourceViewIds, rootView);

        }

    }
@@ -605,9 +604,8 @@ public class UiTranslationController { 
            final View child = viewGroup.getChildAt(i);

            if (child instanceof ViewGroup) {

                findViewsTraversalByAutofillIds((ViewGroup) child, sourceViewIds);

            } else {

                addViewIfNeeded(sourceViewIds, child);

            }

            addViewIfNeeded(sourceViewIds, child);

        }

    }