String and accessibility changes.

Bug: 27490367
Bug: 27491350
Bug: 27655047
Bug: 24573668
Change-Id: I972d15666b206fd4f94fc55bec77b8cfbc6b7e04
This commit is contained in:
Julia Reynolds
2016-03-16 11:40:54 -04:00
parent 1a1ad649c2
commit 017ae508a0
2 changed files with 13 additions and 8 deletions

View File

@@ -132,17 +132,22 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
}
}
protected void setAccessibilityTitle(CharSequence suplementalText) {
protected void setAccessibilityTitle(CharSequence supplementalText) {
Intent intent = getActivity().getIntent();
if (intent != null) {
CharSequence titleText = intent.getCharSequenceExtra(
ConfirmDeviceCredentialBaseFragment.TITLE_TEXT);
if (titleText == null || suplementalText == null) {
if (titleText == null && supplementalText == null) {
return;
}
String accessibilityTitle =
new StringBuilder(titleText).append(",").append(suplementalText).toString();
getActivity().setTitle(Utils.createAccessibleSequence(titleText, accessibilityTitle));
StringBuilder builder = new StringBuilder();
if (titleText != null) {
builder.append(titleText).append(",");
}
if (supplementalText != null) {
builder.append(supplementalText);
}
getActivity().setTitle(Utils.createAccessibleSequence(titleText, builder.toString()));
}
}