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

Merge "String and accessibility changes." into nyc-dev

Browse Source 
am: bfde3fd

* commit 'bfde3fd0852364e957e1f98279ff19272df21894':
  String and accessibility changes.
This commit is contained in:
Julia Reynolds
2016-03-16 17:14:12 +00:00
committed by android-build-merger
parent 632ea87dbd bfde3fd085
commit 9adb7bd370
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -5895,7 +5895,7 @@
<string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
<!-- Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
<string name="zen_mode_visual_interruptions_settings_title">Visual interruptions</string>
<string name="zen_mode_visual_interruptions_settings_title">Block visual disturbances</string>
<!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->
@@ -6501,11 +6501,11 @@
<string name="filter_notif_blocked_apps">Blocked</string>
<!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
<string name="filter_with_domain_urls_apps">With domain URLs</string>
<!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
<!-- Label for showing apps with priority notifications in list [CHAR LIMIT=50] -->
<string name="filter_notif_priority_apps">Overrides Do Not Disturb</string>
<!-- Label for showing apps redacting sensitive notifications in list [CHAR LIMIT=50] -->
<string name="filter_notif_sensitive_apps">No sensitive content on lock screen</string>
<!-- Label for showing apps hiding notifications from lockscreen [CHAR LIMIT=30] -->
<!-- Label for showing apps hiding notifications from lockscreen [CHAR LIMIT=50] -->
<string name="filter_notif_hide_notifications_apps">Never shown on lock screen</string>
<!-- Filter label for apps that the user has silenced [CHAR LIMIT=40] -->
<string name="filter_notif_silent">Shown silently</string>

15
src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
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()));
}
}