commit a7c32ad74996c9fcb0d1d1481f191f0720197e49
author satok <satok@google.com> Mon Jul 25 18:02:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 25 18:02:50 2011 -0700
tree 3e4464aa43b14dc3a7df421330f464ed4f5d80a6
parent 2837fbbe159f2572ea5825022d6defdbf1414e3f
parent 3bca416061f2ef9552b4ba78b3aabc9972eba6c2

Merge "[step8] Use api to get the current spell checker"

src/com/android/settings/inputmethod/SpellCheckerUtils.java

diff --git a/src/com/android/settings/inputmethod/SpellCheckerUtils.java b/src/com/android/settings/inputmethod/SpellCheckerUtils.java
index 09f3a24..fe761a6 100644
--- a/src/com/android/settings/inputmethod/SpellCheckerUtils.java
+++ b/src/com/android/settings/inputmethod/SpellCheckerUtils.java
@@ -31,7 +31,11 @@
     public static void setCurrentSpellChecker(TextServicesManager tsm, SpellCheckerInfo info) {
     }
     public static SpellCheckerInfo getCurrentSpellChecker(TextServicesManager tsm) {
-        return null;
+        final SpellCheckerInfo retval = tsm.getCurrentSpellChecker();
+        if (DBG) {
+            Log.d(TAG, "getCurrentSpellChecker: " + retval);
+        }
+        return retval;
     }
     public static SpellCheckerInfo[] getEnabledSpellCheckers(TextServicesManager tsm) {
         final SpellCheckerInfo[] retval = tsm.getEnabledSpellCheckers();

src/com/android/settings/inputmethod/SpellCheckersSettings.java

diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index 9587e96..c8b3ca9 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -84,7 +84,6 @@
             final PreferenceScreen scs = new PreferenceScreen(getActivity(), null);
             scs.setTitle(sci.getId());
             getPreferenceScreen().addPreference(scs);
-            
         }
     }
 }