From: Jason Monk <jmonk@google.com>
Date: Thu, 6 Jul 2017 19:12:21 +0000 (-0400)
Subject: Fix nav accessibility order
X-Git-Tag: android-x86-9.0-r1~813^2~204^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c7ba5431694546baab5f2d6cea0eb67d40b93f88;p=android-x86%2Fframeworks-base.git

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 09ae521ceb2b..aaa31b675757 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 @@ 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;
     }