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

Commit ff60cf98 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix nav accessibility order" into oc-dr1-dev am: 39bf473d am: 48712814"

parents 93be5125 e0c9db2e

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java

+7 −3
Original line number Diff line number Diff line
@@ -266,13 +266,17 @@ public class NavigationBarInflaterView extends FrameLayout 
        parent.addView(v);

        addToDispatchers(v);

        View lastView = landscape ? mLastLandscape : mLastPortrait;

        View accessibilityView = v;

        if (v instanceof ReverseFrameLayout) {

            accessibilityView = ((ReverseFrameLayout) v).getChildAt(0);

        }

        if (lastView != null) {

            v.setAccessibilityTraversalAfter(lastView.getId());

            accessibilityView.setAccessibilityTraversalAfter(lastView.getId());

        }

        if (landscape) {

            mLastLandscape = v;

            mLastLandscape = accessibilityView;

        } else {

            mLastPortrait = v;

            mLastPortrait = accessibilityView;

        }

        return v;

    }