From c960695f38ae0564dff3a6897fd1843c8e74c604 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 6 Dec 2011 14:06:57 -0800 Subject: Updated keyboard to use SPEAK_PASSWORD preference. Bug: 5678383 Change-Id: Ie9bdc92f4b2c9014159d672b71e4438f8fa34f55 --- .../inputmethod/accessibility/AccessibilityUtils.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java') diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java index 4a2542dec..46663327d 100644 --- a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java +++ b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java @@ -21,6 +21,7 @@ import android.content.SharedPreferences; import android.inputmethodservice.InputMethodService; import android.media.AudioManager; import android.os.SystemClock; +import android.provider.Settings; import android.util.Log; import android.view.MotionEvent; import android.view.accessibility.AccessibilityEvent; @@ -31,6 +32,7 @@ import com.android.inputmethod.compat.AccessibilityManagerCompatWrapper; import com.android.inputmethod.compat.AudioManagerCompatWrapper; import com.android.inputmethod.compat.InputTypeCompatUtils; import com.android.inputmethod.compat.MotionEventCompatUtils; +import com.android.inputmethod.compat.SettingsSecureCompatUtils; import com.android.inputmethod.latin.R; public class AccessibilityUtils { @@ -113,13 +115,23 @@ public class AccessibilityUtils { } /** - * @return {@code true} if the device should not speak text (eg. - * non-control) characters + * Returns whether the device should obscure typed password characters. + * Typically this means speaking "dot" in place of non-control characters. + * + * @return {@code true} if the device should obscure password characters. */ public boolean shouldObscureInput(EditorInfo attribute) { if (attribute == null) return false; + // The user can optionally force speaking passwords. + if (SettingsSecureCompatUtils.ACCESSIBILITY_SPEAK_PASSWORD != null) { + final boolean speakPassword = Settings.Secure.getInt(mContext.getContentResolver(), + SettingsSecureCompatUtils.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0; + if (speakPassword) + return false; + } + // Always speak if the user is listening through headphones. if (mAudioManager.isWiredHeadsetOn() || mAudioManager.isBluetoothA2dpOn()) return false; -- cgit v1.2.3-83-g751a