Merge java-overridable/ into java/ again

This CL a logical revert of a previous CL [1], which separated Java
files into common ones and overridable ones.  Now that that overriding
concept is no longer used, there is no need to keep having separate
directory structure.

 [1]: Ic734bd4d20aa050c688a3158b1a382ae0ac18991
      fb74ab15c1343084740d65ef8744cad33a678e82

Fix: 79323502
Test: make -j aosp_taimen-userdebug && make -j
Test: tapas LatinIME && make -j
Change-Id: I2090bc25d18e6d4f24e91c2cbfe832755cbb4e8f

7 files changed, 0 insertions, 355 deletions

diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java b/java-overridable/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java
deleted file mode 100644
index 5eb613c9b..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2015 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 com.android.inputmethod.latin.AssetFileAddress;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-
-import java.io.File;
-
-public class DictionaryHeaderUtils {
-
-    public static int getContentVersion(AssetFileAddress fileAddress) {
-        final DictionaryHeader header = DictionaryInfoUtils.getDictionaryFileHeaderOrNull(
-                new File(fileAddress.mFilename), fileAddress.mOffset, fileAddress.mLength);
-        return Integer.parseInt(header.mVersionString);
-    }
-}
diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/FeedbackUtils.java b/java-overridable/src/com/android/inputmethod/latin/utils/FeedbackUtils.java
deleted file mode 100644
index 67de8ba32..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/utils/FeedbackUtils.java
+++ /dev/null
@@ -1,38 +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.Intent;
-
-@SuppressWarnings("unused")
-public class FeedbackUtils {
-    public static boolean isHelpAndFeedbackFormSupported() {
-        return false;
-    }
-
-    public static void showHelpAndFeedbackForm(Context context) {
-    }
-
-    public static int getAboutKeyboardTitleResId() {
-        return 0;
-    }
-
-    public static Intent getAboutKeyboardIntent(Context context) {
-        return null;
-    }
-}
diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/FileTransforms.java b/java-overridable/src/com/android/inputmethod/latin/utils/FileTransforms.java
deleted file mode 100644
index 9f4584ec9..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/utils/FileTransforms.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java b/java-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
deleted file mode 100644
index ef1872bf4..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2014 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 com.android.inputmethod.annotations.UsedForTesting;
-
-public class ManagedProfileUtils {
-    private static ManagedProfileUtils INSTANCE = new ManagedProfileUtils();
-    private static ManagedProfileUtils sTestInstance;
-
-    private ManagedProfileUtils() {
-        // This utility class is not publicly instantiable.
-    }
-
-    @UsedForTesting
-    public static void setTestInstance(final ManagedProfileUtils testInstance) {
-        sTestInstance = testInstance;
-    }
-
-    public static ManagedProfileUtils getInstance() {
-        return sTestInstance == null ? INSTANCE : sTestInstance;
-    }
-
-    public boolean hasWorkProfile(final Context context) {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java b/java-overridable/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java
deleted file mode 100644
index 97fb17de3..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java
+++ /dev/null
@@ -1,39 +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 com.android.inputmethod.latin.R;
-
-import android.content.Context;
-
-/**
- * Helper class to get the metadata URI and the additional ID.
- */
-@SuppressWarnings("unused")
-public class MetadataFileUriGetter {
-    private MetadataFileUriGetter() {
-        // This helper class is not instantiable.
-    }
-
-    public static String getMetadataUri(final Context context) {
-        return context.getString(R.string.dictionary_pack_metadata_uri);
-    }
-
-    public static String getMetadataAdditionalId(final Context context) {
-        return "";
-    }
-}
diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
deleted file mode 100644
index 03e58478b..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2014 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.view.inputmethod.InputMethodSubtype;
-
-import com.android.inputmethod.latin.DictionaryFacilitator;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.settings.SettingsValues;
-
-import javax.annotation.Nullable;
-
-@SuppressWarnings("unused")
-public final class StatsUtils {
-
-    private StatsUtils() {
-        // Intentional empty constructor.
-    }
-
-    public static void onCreate(final SettingsValues settingsValues,
-            RichInputMethodManager richImm) {
-    }
-
-    public static void onPickSuggestionManually(final SuggestedWords suggestedWords,
-            final SuggestedWords.SuggestedWordInfo suggestionInfo,
-            final DictionaryFacilitator dictionaryFacilitator) {
-    }
-
-    public static void onBackspaceWordDelete(int wordLength) {
-    }
-
-    public static void onBackspacePressed(int lengthToDelete) {
-    }
-
-    public static void onBackspaceSelectedText(int selectedTextLength) {
-    }
-
-    public static void onDeleteMultiCharInput(int multiCharLength) {
-    }
-
-    public static void onRevertAutoCorrect() {
-    }
-
-    public static void onRevertDoubleSpacePeriod() {
-    }
-
-    public static void onRevertSwapPunctuation() {
-    }
-
-    public static void onFinishInputView() {
-    }
-
-    public static void onCreateInputView() {
-    }
-
-    public static void onStartInputView(int inputType, int displayOrientation, boolean restarting) {
-    }
-
-    public static void onAutoCorrection(final String typedWord, final String autoCorrectionWord,
-            final boolean isBatchInput, final DictionaryFacilitator dictionaryFacilitator,
-            final String prevWordsContext) {
-    }
-
-    public static void onWordCommitUserTyped(final String commitWord, final boolean isBatchMode) {
-    }
-
-    public static void onWordCommitAutoCorrect(final String commitWord, final boolean isBatchMode) {
-    }
-
-    public static void onWordCommitSuggestionPickedManually(
-            final String commitWord, final boolean isBatchMode) {
-    }
-
-    public static void onDoubleSpacePeriod() {
-    }
-
-    public static void onLoadSettings(SettingsValues settingsValues) {
-    }
-
-    public static void onInvalidWordIdentification(final String invalidWord) {
-    }
-
-    public static void onSubtypeChanged(final InputMethodSubtype oldSubtype,
-            final InputMethodSubtype newSubtype) {
-    }
-
-    public static void onSettingsActivity(final String entryPoint) {
-    }
-
-    public static void onInputConnectionLaggy(final int operation, final long duration) {
-    }
-
-    public static void onDecoderLaggy(final int operation, final long duration) {
-    }
-}
diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java
deleted file mode 100644
index cd42f50c7..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2014 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 com.android.inputmethod.latin.DictionaryFacilitator;
-import com.android.inputmethod.latin.settings.SettingsValues;
-
-@SuppressWarnings("unused")
-public class StatsUtilsManager {
-
-    private static final StatsUtilsManager sInstance = new StatsUtilsManager();
-    private static StatsUtilsManager sTestInstance = null;
-
-    /**
-     * @return the singleton instance of {@link StatsUtilsManager}.
-     */
-    public static StatsUtilsManager getInstance() {
-        return sTestInstance != null ? sTestInstance : sInstance;
-    }
-
-    public static void setTestInstance(final StatsUtilsManager testInstance) {
-        sTestInstance = testInstance;
-    }
-
-    public void onCreate(final Context context, final DictionaryFacilitator dictionaryFacilitator) {
-    }
-
-    public void onLoadSettings(final Context context, final SettingsValues settingsValues) {
-    }
-
-    public void onStartInputView() {
-    }
-
-    public void onFinishInputView() {
-    }
-
-    public void onDestroy(final Context context) {
-    }
-}