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

1 files changed, 0 insertions, 56 deletions

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) {
-    }
-}