diff --git a/res/values/strings.xml b/res/values/strings.xml index e73825efdac..0a139d5d69e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5971,12 +5971,12 @@ Require password? - When you enter your PIN to start this device, accessibility services like Talkback won\'t yet be available. + When you enter your PIN to start this device, accessibility services like %1$s won\'t yet be available. - When you enter your pattern to start this device, accessibility services like Talkback won\'t yet be available. + When you enter your pattern to start this device, accessibility services like %1$s won\'t yet be available. - When you enter your password to start this device, accessibility services like Talkback won\'t yet be available. + When you enter your password to start this device, accessibility services like %1$s won\'t yet be available. diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index 2433f262140..e836aeded5c 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -21,6 +21,9 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; +import java.util.List; + +import android.accessibilityservice.AccessibilityServiceInfo; import android.app.AlertDialog; import android.app.Dialog; import android.app.admin.DevicePolicyManager; @@ -158,9 +161,23 @@ public class EncryptionInterstitial extends SettingsActivity { messageId = R.string.encrypt_talkback_dialog_message_password; break; } + + + List list = + AccessibilityManager.getInstance(getActivity()) + .getEnabledAccessibilityServiceList( + AccessibilityServiceInfo.FEEDBACK_ALL_MASK); + final CharSequence exampleAccessibility; + if (list.isEmpty()) { + // This should never happen. But we shouldn't crash + exampleAccessibility = ""; + } else { + exampleAccessibility = list.get(0).getResolveInfo() + .loadLabel(getPackageManager()); + } return new AlertDialog.Builder(getActivity()) .setTitle(titleId) - .setMessage(messageId) + .setMessage(getString(messageId, exampleAccessibility)) .setCancelable(true) .setPositiveButton(android.R.string.ok, this) .setNegativeButton(android.R.string.cancel, this)