Add a method to set the locale to Utils.

Add a setLocale method to Utils that returns the previous locale.
Also unify all calls through the code.

Change-Id: Ic850dc5df19fba00ed3601835652859b4321b544

1 files changed, 2 insertions, 7 deletions

diff --git a/java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java b/java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java
index ce576d0cc..6678082b7 100644
--- a/java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java
+++ b/java/src/com/android/inputmethod/deprecated/languageswitcher/InputLanguageSelection.java
@@ -29,7 +29,6 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
@@ -123,10 +122,7 @@ public class InputLanguageSelection extends PreferenceActivity {
     private Pair<Boolean, Boolean> hasDictionaryOrLayout(Locale locale) {
         if (locale == null) return new Pair<Boolean, Boolean>(false, false);
         final Resources res = getResources();
-        final Configuration conf = res.getConfiguration();
-        final Locale saveLocale = conf.locale;
-        conf.locale = locale;
-        res.updateConfiguration(conf, res.getDisplayMetrics());
+        final Locale saveLocale = Utils.setSystemLocale(res, locale);
         boolean hasDictionary = false;
         boolean hasLayout = false;
 
@@ -155,8 +151,7 @@ public class InputLanguageSelection extends PreferenceActivity {
         } catch (XmlPullParserException e) {
         } catch (IOException e) {
         }
-        conf.locale = saveLocale;
-        res.updateConfiguration(conf, res.getDisplayMetrics());
+        Utils.setSystemLocale(res, saveLocale);
         return new Pair<Boolean, Boolean>(hasDictionary, hasLayout);
     }