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

4 files changed, 0 insertions, 152 deletions

diff --git a/java-overridable/src/com/android/inputmethod/latin/define/DebugFlags.java b/java-overridable/src/com/android/inputmethod/latin/define/DebugFlags.java
deleted file mode 100644
index c509e8322..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/define/DebugFlags.java
+++ /dev/null
@@ -1,31 +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.define;
-
-import android.content.SharedPreferences;
-
-public final class DebugFlags {
-    public static final boolean DEBUG_ENABLED = false;
-
-    private DebugFlags() {
-        // This class is not publicly instantiable.
-    }
-
-    @SuppressWarnings("unused")
-    public static void init(final SharedPreferences prefs) {
-    }
-}
diff --git a/java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java b/java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java
deleted file mode 100644
index 7f57ce858..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java
+++ /dev/null
@@ -1,38 +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.define;
-
-/**
- * Decoder specific constants for LatinIme.
- */
-public class DecoderSpecificConstants {
-
-    // Must be equal to MAX_WORD_LENGTH in native/jni/src/defines.h
-    public static final int DICTIONARY_MAX_WORD_LENGTH = 48;
-
-    // (MAX_PREV_WORD_COUNT_FOR_N_GRAM + 1)-gram is supported in Java side. Needs to modify
-    // MAX_PREV_WORD_COUNT_FOR_N_GRAM in native/jni/src/defines.h for suggestions.
-    public static final int MAX_PREV_WORD_COUNT_FOR_N_GRAM = 3;
-
-    public static final String DECODER_DICT_SUFFIX = "";
-
-    public static final boolean SHOULD_VERIFY_MAGIC_NUMBER = true;
-    public static final boolean SHOULD_VERIFY_CHECKSUM = true;
-    public static final boolean SHOULD_USE_DICT_VERSION = true;
-    public static final boolean SHOULD_AUTO_CORRECT_USING_NON_WHITE_LISTED_SUGGESTION = false;
-    public static final boolean SHOULD_REMOVE_PREVIOUSLY_REJECTED_SUGGESTION = true;
-}
diff --git a/java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java b/java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java
deleted file mode 100644
index abfc36d39..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java
+++ /dev/null
@@ -1,25 +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.define;
-
-public final class JniLibName {
-    private JniLibName() {
-        // This class is not publicly instantiable.
-    }
-
-    public static final String JNI_LIB_NAME = "jni_latinime";
-}
diff --git a/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java b/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
deleted file mode 100644
index f31c20822..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2012 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.define;
-
-public final class ProductionFlags {
-    private ProductionFlags() {
-        // This class is not publicly instantiable.
-    }
-
-    public static final boolean IS_HARDWARE_KEYBOARD_SUPPORTED = false;
-
-    /**
-     * Include all suggestions from all dictionaries in
-     * {@link com.android.inputmethod.latin.SuggestedWords#mRawSuggestions}.
-     */
-    public static final boolean INCLUDE_RAW_SUGGESTIONS = false;
-
-    /**
-     * When false, the metrics logging is not yet ready to be enabled.
-     */
-    public static final boolean IS_METRICS_LOGGING_SUPPORTED = false;
-
-    /**
-     * When {@code false}, the split keyboard is not yet ready to be enabled.
-     */
-    public static final boolean IS_SPLIT_KEYBOARD_SUPPORTED = true;
-
-    /**
-     * When {@code false}, account sign-in in keyboard is not yet ready to be enabled.
-     */
-    public static final boolean ENABLE_ACCOUNT_SIGN_IN = false;
-
-    /**
-     * When {@code true}, user history dictionary sync feature is ready to be enabled.
-     */
-    public static final boolean ENABLE_USER_HISTORY_DICTIONARY_SYNC =
-            ENABLE_ACCOUNT_SIGN_IN && false;
-
-    /**
-     * When {@code true}, the IME maintains per account {@link UserHistoryDictionary}.
-     */
-    public static final boolean ENABLE_PER_ACCOUNT_USER_HISTORY_DICTIONARY =
-            ENABLE_ACCOUNT_SIGN_IN && false;
-}