resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev

Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0

1 files changed, 0 insertions, 12 deletions

diff --git a/java/src/com/android/inputmethod/dictionarypack/CommonPreferences.java b/java/src/com/android/inputmethod/dictionarypack/CommonPreferences.java
index 3cd822a3c..3d0e29ed0 100644
--- a/java/src/com/android/inputmethod/dictionarypack/CommonPreferences.java
+++ b/java/src/com/android/inputmethod/dictionarypack/CommonPreferences.java
@@ -22,8 +22,6 @@ import android.content.SharedPreferences;
 public final class CommonPreferences {
     private static final String COMMON_PREFERENCES_NAME = "LatinImeDictPrefs";
 
-    public static final String PREF_FORCE_DOWNLOAD_DICT = "pref_key_force_download_dict";
-
     public static SharedPreferences getCommonPreferences(final Context context) {
         return context.getSharedPreferences(COMMON_PREFERENCES_NAME, 0);
     }
@@ -39,14 +37,4 @@ public final class CommonPreferences {
         editor.putBoolean(id, false);
         editor.apply();
     }
-
-    public static boolean isForceDownloadDict(Context context) {
-        return getCommonPreferences(context).getBoolean(PREF_FORCE_DOWNLOAD_DICT, false);
-    }
-
-    public static void setForceDownloadDict(Context context, boolean forceDownload) {
-        SharedPreferences.Editor editor = getCommonPreferences(context).edit();
-        editor.putBoolean(PREF_FORCE_DOWNLOAD_DICT, forceDownload);
-        editor.apply();
-    }
 }