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, 69 deletions

diff --git a/java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java b/java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java
deleted file mode 100644
index 8291b4f72..000000000
--- a/java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java
+++ /dev/null
@@ -1,69 +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.touchinputconsumer;
-
-import android.view.inputmethod.EditorInfo;
-
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.DictionaryFacilitator;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.inputlogic.PrivateCommandPerformer;
-
-import java.util.Locale;
-
-/**
- * Stub for GestureConsumer.
- * <br>
- * The methods of this class should only be called from a single thread, e.g.,
- * the UI Thread.
- */
-@SuppressWarnings("unused")
-public class GestureConsumer {
-    public static final GestureConsumer NULL_GESTURE_CONSUMER =
-            new GestureConsumer();
-
-    public static GestureConsumer newInstance(
-            final EditorInfo editorInfo, final PrivateCommandPerformer commandPerformer,
-            final Locale locale, final Keyboard keyboard) {
-        return GestureConsumer.NULL_GESTURE_CONSUMER;
-    }
-
-    private GestureConsumer() {
-    }
-
-    public boolean willConsume() {
-        return false;
-    }
-
-    public void onInit(final Locale locale, final Keyboard keyboard) {
-    }
-
-    public void onGestureStarted(final Locale locale, final Keyboard keyboard) {
-    }
-
-    public void onGestureCanceled() {
-    }
-
-    public void onGestureCompleted(final InputPointers inputPointers) {
-    }
-
-    public void onImeSuggestionsProcessed(final SuggestedWords suggestedWords,
-            final int composingStart, final int composingLength,
-            final DictionaryFacilitator dictionaryFacilitator) {
-    }
-}