nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am a980fb39: Merge "Refactor RunInLocale a bit" 

* commit 'a980fb39a5ce8b3103c74c654a4e11550ae6d632':
  Refactor RunInLocale a bit
main
Tadashi G. Takaoka 2014-04-17 09:02:51 +00:00 committed by Android Git Automerger
parent 5e04782ea4 a980fb39a5
commit b3ba01b5de
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/src/com/android/inputmethod/latin/utils/RunInLocale.java
View File

@ -30,25 +30,23 @@ public abstract class RunInLocale<T> {
* Execute {@link #job(Resources)} method in specified system locale exclusively. * Execute {@link #job(Resources)} method in specified system locale exclusively.
* *
* @param res the resources to use. * @param res the resources to use.
* @param newLocale the locale to change to. * @param newLocale the locale to change to. Run in system locale if null.
* @return the value returned from {@link #job(Resources)}. * @return the value returned from {@link #job(Resources)}.
*/ */
public T runInLocale(final Resources res, final Locale newLocale) { public T runInLocale(final Resources res, final Locale newLocale) {
synchronized (sLockForRunInLocale) { synchronized (sLockForRunInLocale) {
final Configuration conf = res.getConfiguration(); final Configuration savedConf = res.getConfiguration();
final Locale oldLocale = conf.locale; if (newLocale == null || newLocale.equals(savedConf.locale)) {
final boolean needsChange = (newLocale != null && !newLocale.equals(oldLocale)); return job(res);
}
final Configuration newConf = new Configuration();
newConf.setTo(savedConf);
newConf.setLocale(newLocale);
try { try {
if (needsChange) { res.updateConfiguration(newConf, null);
conf.locale = newLocale;
res.updateConfiguration(conf, null);
}
return job(res); return job(res);
} finally { } finally {
if (needsChange) { res.updateConfiguration(savedConf, null);
conf.locale = oldLocale;
res.updateConfiguration(conf, null);
}
} }
} }
} }