diff options
| -rw-r--r-- | core/java/android/view/textservice/TextServicesManager.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/TextServicesManagerService.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java index fc59e6e..161e8fb 100644 --- a/core/java/android/view/textservice/TextServicesManager.java +++ b/core/java/android/view/textservice/TextServicesManager.java @@ -217,7 +217,7 @@ public final class TextServicesManager { public SpellCheckerSubtype getCurrentSpellCheckerSubtype( boolean allowImplicitlySelectedSubtype) { try { - // Passing null as a locale for ICS + // Passing null as a locale until we support multiple enabled spell checker subtypes. return sService.getCurrentSpellCheckerSubtype(null, allowImplicitlySelectedSubtype); } catch (RemoteException e) { Log.e(TAG, "Error in getCurrentSpellCheckerSubtype: " + e); diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java index c7b336f..c74dd00 100644 --- a/services/java/com/android/server/TextServicesManagerService.java +++ b/services/java/com/android/server/TextServicesManagerService.java @@ -198,7 +198,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { } // TODO: Respect allowImplicitlySelectedSubtype - // TODO: Save SpellCheckerSubtype by supported languages. + // TODO: Save SpellCheckerSubtype by supported languages by looking at "locale". @Override public SpellCheckerSubtype getCurrentSpellCheckerSubtype( String locale, boolean allowImplicitlySelectedSubtype) { @@ -250,10 +250,10 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { for (int i = 0; i < sci.getSubtypeCount(); ++i) { final SpellCheckerSubtype scs = sci.getSubtypeAt(i); if (hashCode == 0) { - if (candidateLocale.equals(locale)) { + final String scsLocale = scs.getLocale(); + if (candidateLocale.equals(scsLocale)) { return scs; } else if (candidate == null) { - final String scsLocale = scs.getLocale(); if (candidateLocale.length() >= 2 && scsLocale.length() >= 2 && candidateLocale.startsWith(scsLocale)) { // Fall back to the applicable language |