X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryApplication.java;h=1e3788be869e7d830511705e391282e1af33c0ca;hp=c17c7ef82975e407f707d4da0cf8e67963edb2da;hb=c76660b2772122109529d3616289980a7084eeeb;hpb=3ce0dd16e69302365d3bc802f298a5388b293d86

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index c17c7ef..1e3788b 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -21,7 +21,7 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 import android.support.v4.view.MenuItemCompat;
 import android.util.Log;
 import android.util.TypedValue;
@@ -29,7 +29,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 
-import com.hughes.android.dictionary.CollatorWrapper;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.dictionary.engine.Dictionary;
 import com.hughes.android.dictionary.engine.TransliteratorManager;
@@ -64,9 +63,9 @@ public enum DictionaryApplication {
     // Leave it enabled by default for correctness except
     // for my known broken development/performance test device config.
     //static public final boolean USE_COLLATOR = !android.os.Build.FINGERPRINT.equals("Samsung/cm_tassve/tassve:4.4.4/KTU84Q/20150211:userdebug/release-keys");
-    static public final boolean USE_COLLATOR = true;
+    public static final boolean USE_COLLATOR = true;
 
-    static public final TransliteratorManager.ThreadSetup threadBackground = new TransliteratorManager.ThreadSetup() {
+    public static final TransliteratorManager.ThreadSetup threadBackground = new TransliteratorManager.ThreadSetup() {
         @Override
         public void onThreadStart() {
             // THREAD_PRIORITY_BACKGROUND seemed like a good idea, but it
@@ -289,7 +288,7 @@ public enum DictionaryApplication {
         return dictDir;
     }
 
-    static public boolean checkFileCreate(File dir) {
+    public static boolean checkFileCreate(File dir) {
         boolean res = false;
         File testfile = new File(dir, "quickdic_writetest");
         try {
@@ -406,7 +405,7 @@ public enum DictionaryApplication {
                         && !name2.startsWith(defaultLangName + "-")) {
                     return -1;
                 } else if (name2.startsWith(defaultLangName + "-")
-                           && !name1.startsWith(defaultLangName + "-")) {
+                        && !name1.startsWith(defaultLangName + "-")) {
                     return 1;
                 }
             }