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

Commit fb9a0c2b authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: 48712814

Change-Id: I8f87f2dc652aa5c36d8753f2df31185c637e30c7
parents dd8293d2 48712814

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;

    }