Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix accessibility order in nav bar" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-05-10 15:26:35 +00:00
committed by Android (Google) Code Review
parent aaabcce6d4 c62cf80faa
commit 4691e24d0b
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,6 +67,9 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi
private SparseArray<ButtonDispatcher> mButtonDispatchers; private SparseArray<ButtonDispatcher> mButtonDispatchers;
private String mCurrentLayout; private String mCurrentLayout;
private View mLastRot0;
private View mLastRot90;
public NavigationBarInflaterView(Context context, AttributeSet attrs) { public NavigationBarInflaterView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
mDensity = context.getResources().getConfiguration().densityDpi; mDensity = context.getResources().getConfiguration().densityDpi;
@@ -163,6 +166,7 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi
String[] start = sets[0].split(BUTTON_SEPARATOR); String[] start = sets[0].split(BUTTON_SEPARATOR);
String[] center = sets[1].split(BUTTON_SEPARATOR); String[] center = sets[1].split(BUTTON_SEPARATOR);
String[] end = sets[2].split(BUTTON_SEPARATOR); String[] end = sets[2].split(BUTTON_SEPARATOR);
// Inflate these in start to end order or accessibility traversal will be messed up.
inflateButtons(start, (ViewGroup) mRot0.findViewById(R.id.ends_group), false); inflateButtons(start, (ViewGroup) mRot0.findViewById(R.id.ends_group), false);
inflateButtons(start, (ViewGroup) mRot90.findViewById(R.id.ends_group), true); inflateButtons(start, (ViewGroup) mRot90.findViewById(R.id.ends_group), true);
@@ -240,6 +244,15 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi
} }
parent.addView(v); parent.addView(v);
addToDispatchers(v); addToDispatchers(v);
View lastView = landscape ? mLastRot90 : mLastRot0;
if (lastView != null) {
v.setAccessibilityTraversalAfter(lastView.getId());
}
if (landscape) {
mLastRot90 = v;
} else {
mLastRot0 = v;
}
return v; return v;
} }