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

Commit 48712814 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

Change-Id: Ie13cea504a8ff25105aabec866b0b1f616f4ec16
parents 21a5a5e1 39bf473d

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

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

        parent.addView(v);

        addToDispatchers(v);

        addToDispatchers(v);

        View lastView = landscape ? mLastLandscape : mLastPortrait;

        View lastView = landscape ? mLastLandscape : mLastPortrait;

        View accessibilityView = v;

        if (v instanceof ReverseFrameLayout) {

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

        }

        if (lastView != null) {

        if (lastView != null) {

            v.setAccessibilityTraversalAfter(lastView.getId());

            accessibilityView.setAccessibilityTraversalAfter(lastView.getId());

        }

        }

        if (landscape) {

        if (landscape) {

            mLastLandscape = v;

            mLastLandscape = accessibilityView;

        } else {

        } else {

            mLastPortrait = v;

            mLastPortrait = accessibilityView;

        }

        }

        return v;

        return v;

    }

    }