Merge "Move settings related classes to "settings""

3 files changed, 39 insertions, 49 deletions

diff --git a/java/src/com/android/inputmethod/latin/utils/AdditionalFeaturesSettingUtils.java b/java/src/com/android/inputmethod/latin/utils/AdditionalFeaturesSettingUtils.java
deleted file mode 100644
index 18dfb3dba..000000000
--- a/java/src/com/android/inputmethod/latin/utils/AdditionalFeaturesSettingUtils.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.Context;
-import android.content.SharedPreferences;
-
-import com.android.inputmethod.latin.Settings;
-import com.android.inputmethodcommon.InputMethodSettingsFragment;
-
-/**
- * Utility class for managing additional features settings.
- */
-public class AdditionalFeaturesSettingUtils {
-    public static final int ADDITIONAL_FEATURES_SETTINGS_SIZE = 0;
-
-    private AdditionalFeaturesSettingUtils() {
-        // This utility class is not publicly instantiable.
-    }
-
-    public static void addAdditionalFeaturesPreferences(
-            final Context context, final InputMethodSettingsFragment settingsFragment) {
-        // do nothing.
-    }
-
-    public static void readAdditionalFeaturesPreferencesIntoArray(
-            final SharedPreferences prefs, final int[] additionalFeaturesPreferences) {
-        // do nothing.
-    }
-
-    public static int[] getAdditionalNativeSuggestOptions() {
-        return Settings.getInstance().getCurrent().mAdditionalFeaturesSettingValues;
-    }
-}
diff --git a/java/src/com/android/inputmethod/latin/utils/FileTransforms.java b/java/src/com/android/inputmethod/latin/utils/FileTransforms.java
new file mode 100644
index 000000000..9f4584ec9
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/utils/FileTransforms.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2011 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 java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+
+public final class FileTransforms {
+    public static OutputStream getCryptedStream(OutputStream out) {
+        // Crypt the stream.
+        return out;
+    }
+
+    public static InputStream getDecryptedStream(InputStream in) {
+        // Decrypt the stream.
+        return in;
+    }
+
+    public static InputStream getUncompressedStream(InputStream in) throws IOException {
+        return new GZIPInputStream(in);
+    }
+}
diff --git a/java/src/com/android/inputmethod/latin/utils/UserLogRingCharBuffer.java b/java/src/com/android/inputmethod/latin/utils/UserLogRingCharBuffer.java
index a2c6c4524..161386e2e 100644
--- a/java/src/com/android/inputmethod/latin/utils/UserLogRingCharBuffer.java
+++ b/java/src/com/android/inputmethod/latin/utils/UserLogRingCharBuffer.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.latin.utils;
 import android.inputmethodservice.InputMethodService;
 
 import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.Settings;
+import com.android.inputmethod.latin.settings.Settings;
 
 public final class UserLogRingCharBuffer {
     public /* for test */ static final int BUFSIZE = 20;