diff options
| -rw-r--r-- | core/java/android/widget/SpellChecker.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/TextServicesManagerService.java | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java index 5d8db2f37122..e9eec100cab3 100644 --- a/core/java/android/widget/SpellChecker.java +++ b/core/java/android/widget/SpellChecker.java @@ -61,7 +61,9 @@ public class SpellChecker implements SpellCheckerSessionListener { final TextServicesManager textServicesManager = (TextServicesManager) textView.getContext(). getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE); mSpellCheckerSession = textServicesManager.newSpellCheckerSession( - null /* not currently used by the textServicesManager */, Locale.getDefault(), + null /* not currently used by the textServicesManager */, + null /* null locale means use the languages defined in Settings + if referToSpellCheckerLanguageSettings is true */, this, true /* means use the languages defined in Settings */); mCookie = hashCode(); diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 3624ac168425..b74f9b63de56 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -9480,8 +9480,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return false; } - int posX = mPositionX + positionX; - int posY = mPositionY + positionY; + int posX = mPositionX + positionX - getScrollX(); + int posY = mPositionY + positionY - getScrollY(); // Offset by 1 to take into account 0.5 and int rounding around getPrimaryHorizontal. return posX >= clip.left - 1 && posX <= clip.right + 1 && diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java index c792b33bf2b4..ef48b9e2bc30 100644 --- a/services/java/com/android/server/TextServicesManagerService.java +++ b/services/java/com/android/server/TextServicesManagerService.java @@ -238,7 +238,8 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { } } else if (scs.hashCode() == hashCode) { if (DBG) { - Slog.w(TAG, "Return subtype " + scs.hashCode()); + Slog.w(TAG, "Return subtype " + scs.hashCode() + ", input= " + locale + + ", " + scs.getLocale()); } return scs; } |