commit | c7ba5431694546baab5f2d6cea0eb67d40b93f88 | [log] [tgz] |
---|---|---|
author | Jason Monk <jmonk@google.com> | Thu Jul 06 15:12:21 2017 -0400 |
committer | Jason Monk <jmonk@google.com> | Thu Jul 06 15:12:21 2017 -0400 |
tree | 16631ba59ad1da0463ece987e8e35cf72a4ce217 | |
parent | 84e0f453d1c99313c5aab5debce052ff3f0ec24e [diff] [blame] |
Fix nav accessibility order Test: manual Change-Id: I0d3f65c84a4158024f90c47ce9da329d4bd210ac Fixes: 63333329
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java index 09ae521..aaa31b6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
@@ -269,13 +269,17 @@ 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; }