1 files changed, 11 insertions, 16 deletions
diff --git a/java/src/com/android/inputmethod/compat/AbstractCompatWrapper.java b/java/src/com/android/inputmethod/compat/SettingsSecureCompatUtils.java
index 65949357f..1b79992f0 100644
--- a/java/src/com/android/inputmethod/compat/AbstractCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/SettingsSecureCompatUtils.java
@@ -16,24 +16,19 @@
 
 package com.android.inputmethod.compat;
 
-import android.util.Log;
+import java.lang.reflect.Field;
 
-public abstract class AbstractCompatWrapper {
-    private static final String TAG = AbstractCompatWrapper.class.getSimpleName();
-    protected final Object mObj;
+public class SettingsSecureCompatUtils {
+    private static final Field FIELD_ACCESSIBILITY_SPEAK_PASSWORD = CompatUtils.getField(
+            android.provider.Settings.Secure.class, "ACCESSIBILITY_SPEAK_PASSWORD");
 
-    public AbstractCompatWrapper(Object obj) {
-        if (obj == null) {
-            Log.e(TAG, "Invalid input to AbstructCompatWrapper");
-        }
-        mObj = obj;
+    private SettingsSecureCompatUtils() {
+        // This class is non-instantiable.
     }
 
-    public Object getOriginalObject() {
-        return mObj;
-    }
-
-    public boolean hasOriginalObject() {
-        return mObj != null;
-    }
+    /**
+     * Whether to speak passwords while in accessibility mode.
+     */
+    public static final String ACCESSIBILITY_SPEAK_PASSWORD = (String) CompatUtils.getFieldValue(
+            null, null, FIELD_ACCESSIBILITY_SPEAK_PASSWORD);
 }