diff --git a/java/Android.mk b/java/Android.mk index 154f3a20c..837b2d9e3 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -17,7 +17,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(call all-java-files-under, src ../java-overridable/src) +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := LatinIME diff --git a/java-overridable/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java b/java/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java rename to java/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java diff --git a/java-overridable/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java b/java/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java rename to java/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java diff --git a/java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java b/java/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java rename to java/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java diff --git a/java-overridable/src/com/android/inputmethod/latin/DictionaryFacilitatorProvider.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorProvider.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/DictionaryFacilitatorProvider.java rename to java/src/com/android/inputmethod/latin/DictionaryFacilitatorProvider.java diff --git a/java-overridable/src/com/android/inputmethod/latin/about/AboutPreferences.java b/java/src/com/android/inputmethod/latin/about/AboutPreferences.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/about/AboutPreferences.java rename to java/src/com/android/inputmethod/latin/about/AboutPreferences.java diff --git a/java-overridable/src/com/android/inputmethod/latin/accounts/AccountStateChangedListener.java b/java/src/com/android/inputmethod/latin/accounts/AccountStateChangedListener.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/accounts/AccountStateChangedListener.java rename to java/src/com/android/inputmethod/latin/accounts/AccountStateChangedListener.java diff --git a/java-overridable/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java b/java/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java rename to java/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java diff --git a/java-overridable/src/com/android/inputmethod/latin/define/DebugFlags.java b/java/src/com/android/inputmethod/latin/define/DebugFlags.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/define/DebugFlags.java rename to java/src/com/android/inputmethod/latin/define/DebugFlags.java diff --git a/java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java b/java/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java rename to java/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java diff --git a/java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java b/java/src/com/android/inputmethod/latin/define/JniLibName.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java rename to java/src/com/android/inputmethod/latin/define/JniLibName.java diff --git a/java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java b/java/src/com/android/inputmethod/latin/define/ProductionFlags.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java rename to java/src/com/android/inputmethod/latin/define/ProductionFlags.java diff --git a/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java b/java/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java rename to java/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java diff --git a/java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java b/java/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java rename to java/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java b/java/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java rename to java/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/FeedbackUtils.java b/java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/utils/FeedbackUtils.java rename to java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/FileTransforms.java b/java/src/com/android/inputmethod/latin/utils/FileTransforms.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/utils/FileTransforms.java rename to java/src/com/android/inputmethod/latin/utils/FileTransforms.java diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java b/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java rename to java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java b/java/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java rename to java/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java b/java/src/com/android/inputmethod/latin/utils/StatsUtils.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java rename to java/src/com/android/inputmethod/latin/utils/StatsUtils.java diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java b/java/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java similarity index 100% rename from java-overridable/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java rename to java/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java