PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Doris Ling
2016-08-04 17:51:11 +00:00
committed by Android (Google) Code Review
parent 5a845315f4 30e348b3c3
commit 01f26e84f4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
View File

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