Merge "Fix accessibility title in confirm device credential fragment."

This commit is contained in:
Doris Ling
2016-08-04 17:51:11 +00:00
committed by Android (Google) Code Review

View File

@@ -164,14 +164,18 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
if (intent != null) {
CharSequence titleText = intent.getCharSequenceExtra(
ConfirmDeviceCredentialBaseFragment.TITLE_TEXT);
if (titleText == null || supplementalText == null) {
if (supplementalText == null) {
return;
}
if (titleText == null) {
getActivity().setTitle(supplementalText);
} else {
String accessibilityTitle =
new StringBuilder(titleText).append(",").append(supplementalText).toString();
getActivity().setTitle(Utils.createAccessibleSequence(titleText, accessibilityTitle));
}
}
}
@Override
public void onPause() {