From 7a2459ca13c42ae3f3e07d43b671e78d5c4939c7 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Sun, 6 May 2018 20:46:17 -0700 Subject: [PATCH] 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 --- java/Android.mk | 2 +- .../com/android/inputmethod/compat/AppWorkaroundsHelper.java | 0 .../inputmethod/dictionarypack/DictionaryPackConstants.java | 0 .../android/inputmethod/dictionarypack/MetadataUriGetter.java | 0 .../inputmethod/latin/DictionaryFacilitatorProvider.java | 0 .../com/android/inputmethod/latin/about/AboutPreferences.java | 0 .../inputmethod/latin/accounts/AccountStateChangedListener.java | 0 .../android/inputmethod/latin/accounts/LoginAccountUtils.java | 0 .../src/com/android/inputmethod/latin/define/DebugFlags.java | 0 .../inputmethod/latin/define/DecoderSpecificConstants.java | 0 .../src/com/android/inputmethod/latin/define/JniLibName.java | 0 .../com/android/inputmethod/latin/define/ProductionFlags.java | 0 .../latin/settings/AdditionalFeaturesSettingUtils.java | 0 .../inputmethod/latin/touchinputconsumer/GestureConsumer.java | 0 .../android/inputmethod/latin/utils/DictionaryHeaderUtils.java | 0 .../src/com/android/inputmethod/latin/utils/FeedbackUtils.java | 0 .../src/com/android/inputmethod/latin/utils/FileTransforms.java | 0 .../android/inputmethod/latin/utils/ManagedProfileUtils.java | 0 .../android/inputmethod/latin/utils/MetadataFileUriGetter.java | 0 .../src/com/android/inputmethod/latin/utils/StatsUtils.java | 0 .../com/android/inputmethod/latin/utils/StatsUtilsManager.java | 0 21 files changed, 1 insertion(+), 1 deletion(-) rename {java-overridable => java}/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/DictionaryFacilitatorProvider.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/about/AboutPreferences.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/accounts/AccountStateChangedListener.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/define/DebugFlags.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/define/JniLibName.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/define/ProductionFlags.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/utils/FeedbackUtils.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/utils/FileTransforms.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/utils/StatsUtils.java (100%) rename {java-overridable => java}/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java (100%) 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