Support accessibility in History.
Fixes: 33429660
Toggle accessibility importance of main Calculator elements based on
the open state of DragLayout. This is necessary due to the fact that
Talkback does not use visibility as a cue for determining accessibility
importance in RelativeLayout, which is the base class of DragLayout.
Without this workaround, it's possible to traverse to main Calculator
elements even when HistoryFragment is open.
Change-Id: Iff3d775ec72aa50fe8972c1def32f4999d90a8f9
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index b45597a..44ad0ac 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -277,6 +277,7 @@
private View mDeleteButton;
private View mClearButton;
private View mEqualButton;
+ private View mMainCalculator;
private TextView mInverseToggle;
private TextView mModeToggle;
@@ -390,6 +391,7 @@
}
});
+ mMainCalculator = findViewById(R.id.main_calculator);
mDisplayView = (CalculatorDisplay) findViewById(R.id.display);
mModeView = (TextView) findViewById(R.id.mode);
mFormulaText = (CalculatorFormula) findViewById(R.id.formula);
@@ -463,6 +465,14 @@
if (mDisplayView.isToolbarVisible()) {
showAndMaybeHideToolbar();
}
+ // If HistoryFragment is showing, hide the main Calculator elements from accessibility.
+ // This is because Talkback does not use visibility as a cue for RelativeLayout elements,
+ // and RelativeLayout is the base class of DragLayout.
+ // If we did not do this, it would be possible to traverse to main Calculator elements from
+ // HistoryFragment.
+ mMainCalculator.setImportantForAccessibility(
+ mDragLayout.isOpen() ? View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
+ : View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
}
@Override
@@ -734,11 +744,13 @@
private void removeHistoryFragment() {
final FragmentManager manager = getFragmentManager();
- if (manager == null || manager.isDestroyed()) {
- return;
+ if (manager != null && !manager.isDestroyed()) {
+ manager.popBackStackImmediate(HistoryFragment.TAG,
+ FragmentManager.POP_BACK_STACK_INCLUSIVE);
}
- manager.popBackStackImmediate(HistoryFragment.TAG,
- FragmentManager.POP_BACK_STACK_INCLUSIVE);
+
+ // When HistoryFragment is hidden, the main Calculator is important for accessibility again.
+ mMainCalculator.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
}
/**
@@ -1329,6 +1341,10 @@
.addToBackStack(HistoryFragment.TAG)
.commit();
manager.executePendingTransactions();
+
+ // When HistoryFragment is visible, hide all descendants of the main Calculator view.
+ mMainCalculator.setImportantForAccessibility(
+ View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
}
// TODO: pass current scroll position of result
}