am c0d31239: Merge "[ML2] Small refactoring"

* commit 'c0d3123930dc695f94138f1f3930033d0878eee0':
  [ML2] Small refactoring
main
Jean Chalard 2014-09-02 06:51:30 +00:00 committed by Android Git Automerger
commit 1cab90ab27
1 changed files with 1 additions and 5 deletions

View File

@ -1179,10 +1179,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
return mInputLogic.getCurrentRecapitalizeState(); return mInputLogic.getCurrentRecapitalizeState();
} }
public Locale getCurrentSubtypeLocale() {
return mSubtypeSwitcher.getCurrentSubtypeLocale();
}
/** /**
* @param codePoints code points to get coordinates for. * @param codePoints code points to get coordinates for.
* @return x,y coordinates for this keyboard, as a flattened array. * @return x,y coordinates for this keyboard, as a flattened array.
@ -1496,7 +1492,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} }
final String wordToShow; final String wordToShow;
if (CapsModeUtils.isAutoCapsMode(mInputLogic.mLastComposedWord.mCapitalizedMode)) { if (CapsModeUtils.isAutoCapsMode(mInputLogic.mLastComposedWord.mCapitalizedMode)) {
wordToShow = word.toLowerCase(getCurrentSubtypeLocale()); wordToShow = word.toLowerCase(mSubtypeSwitcher.getCurrentSubtypeLocale());
} else { } else {
wordToShow = word; wordToShow = word;
} }