diff options
| author | Jim Miller <jaggies@google.com> | 2014-10-17 18:28:52 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2014-10-17 18:28:52 -0700 |
| commit | aa0376759873893197a0109025fd4ec8beca5929 (patch) | |
| tree | aee830652e2530550f31e982d46cae4d950e053a /src/com/android/settings/EncryptionInterstitial.java | |
| parent | 47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0 (diff) | |
| download | packages_apps_Settings-aa0376759873893197a0109025fd4ec8beca5929.zip packages_apps_Settings-aa0376759873893197a0109025fd4ec8beca5929.tar.gz packages_apps_Settings-aa0376759873893197a0109025fd4ec8beca5929.tar.bz2 | |
Fix bad string in EncryptionInterstitial
The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.
Fixes bug 17881324
Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96
Diffstat (limited to 'src/com/android/settings/EncryptionInterstitial.java')
| -rw-r--r-- | src/com/android/settings/EncryptionInterstitial.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index 2433f26..e836aed 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<AccessibilityServiceInfo> 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) |