Merge "String and accessibility changes." into nyc-dev (bfde3fd0) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -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>

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -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()));
		}
		}