Make RunInLocale as top-level class

Change-Id: I07ed606b7aba098a5be85533e5baff300b21fb44

3 files changed, 55 insertions, 37 deletions

diff --git a/java/src/com/android/inputmethod/latin/utils/LocaleUtils.java b/java/src/com/android/inputmethod/latin/utils/LocaleUtils.java
index 58d062bbd..22045aa38 100644
--- a/java/src/com/android/inputmethod/latin/utils/LocaleUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/LocaleUtils.java
@@ -16,8 +16,6 @@
 
 package com.android.inputmethod.latin.utils;
 
-import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.text.TextUtils;
 
 import java.util.HashMap;
@@ -164,40 +162,6 @@ public final class LocaleUtils {
         return LOCALE_MATCH <= level;
     }
 
-    static final Object sLockForRunInLocale = new Object();
-
-    // TODO: Make this an external class
-    public abstract static class RunInLocale<T> {
-        protected abstract T job(Resources res);
-
-        /**
-         * Execute {@link #job(Resources)} method in specified system locale exclusively.
-         *
-         * @param res the resources to use. Pass current resources.
-         * @param newLocale the locale to change to
-         * @return the value returned from {@link #job(Resources)}.
-         */
-        public T runInLocale(final Resources res, final Locale newLocale) {
-            synchronized (sLockForRunInLocale) {
-                final Configuration conf = res.getConfiguration();
-                final Locale oldLocale = conf.locale;
-                final boolean needsChange = (newLocale != null && !newLocale.equals(oldLocale));
-                try {
-                    if (needsChange) {
-                        conf.locale = newLocale;
-                        res.updateConfiguration(conf, null);
-                    }
-                    return job(res);
-                } finally {
-                    if (needsChange) {
-                        conf.locale = oldLocale;
-                        res.updateConfiguration(conf, null);
-                    }
-                }
-            }
-        }
-    }
-
     private static final HashMap<String, Locale> sLocaleCache = CollectionUtils.newHashMap();
 
     /**
diff --git a/java/src/com/android/inputmethod/latin/utils/RunInLocale.java b/java/src/com/android/inputmethod/latin/utils/RunInLocale.java
new file mode 100644
index 000000000..2c9e3b191
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/utils/RunInLocale.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin.utils;
+
+import android.content.res.Configuration;
+import android.content.res.Resources;
+
+import java.util.Locale;
+
+public abstract class RunInLocale<T> {
+    private static final Object sLockForRunInLocale = new Object();
+
+    protected abstract T job(final Resources res);
+
+    /**
+     * Execute {@link #job(Resources)} method in specified system locale exclusively.
+     *
+     * @param res the resources to use.
+     * @param newLocale the locale to change to.
+     * @return the value returned from {@link #job(Resources)}.
+     */
+    public T runInLocale(final Resources res, final Locale newLocale) {
+        synchronized (sLockForRunInLocale) {
+            final Configuration conf = res.getConfiguration();
+            final Locale oldLocale = conf.locale;
+            final boolean needsChange = (newLocale != null && !newLocale.equals(oldLocale));
+            try {
+                if (needsChange) {
+                    conf.locale = newLocale;
+                    res.updateConfiguration(conf, null);
+                }
+                return job(res);
+            } finally {
+                if (needsChange) {
+                    conf.locale = oldLocale;
+                    res.updateConfiguration(conf, null);
+                }
+            }
+        }
+    }
+}
diff --git a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
index 4cfa2897d..16728092d 100644
--- a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
@@ -27,7 +27,6 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import com.android.inputmethod.latin.DictionaryFactory;
 import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.LocaleUtils.RunInLocale;
 
 import java.util.HashMap;
 import java.util.Locale;