aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-021-1/+1
|\ \
| * | Import translations. DO NOT MERGEBill Yi2019-02-021-1/+1
| |/ | | | | | | | | Change-Id: Id25f8e0d7b2bb7c47e9f04e6355a10f2da9f9b25 Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-021-8/+8
|\ \
| * | Import translations. DO NOT MERGEBill Yi2019-02-021-8/+8
| |/ | | | | | | | | Change-Id: I51b7669e416dce6ccf73724110d9ed446e0f2940 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBill Yi2019-02-021-189/+189
|/ | | | | Change-Id: I58ea73335befe5324077a7775c4ff78f04ed1a4b Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2019-01-281-5/+5
| | | | | Change-Id: I9612b424937fd60ea265f2276d5a53ebe332afb9 Auto-generated-cl: translation import
* Merge "Move LatinIME and its lib to /product" am: 149b9d4f6e am: 84d156b1e6Anton Hansson2019-01-141-0/+2
|\ | | | | | | | | | | am: d894eec1ee Change-Id: Ib7cdb0007c22934f7736cd02c02e0f9358f889d4
| * Merge "Move LatinIME and its lib to /product" am: 149b9d4f6eAnton Hansson2019-01-141-0/+2
| |\ | | | | | | | | | | | | | | | am: 84d156b1e6 Change-Id: I386b9b5ed6ba02a4cd00efb75804ffef24603a2c
| | * Move LatinIME and its lib to /productAnton Hansson2019-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This app is frequently overriden by proprietary apps on shipping devices, so move it to /product along with its jni library. Bug: 122353713 Test: launch keyboard on aosp_arm64 emulator Change-Id: Ied8c1e6133b67e28da76b0e48254e2e2e0ed15bf
* | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-01-121-1/+1
|\ \ \
| * | | Import translations. DO NOT MERGEBill Yi2019-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I23b6acdfb44a25c8136764c6b1b254dd54e363a2 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBill Yi2019-01-111-2/+2
|/ / / | | | | | | | | | | | | Change-Id: I57c8de2acc020fdb8d30f8cdc6f5b616acc98eab Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-12-112-4/+4
|\ \ \
| * | | Import translations. DO NOT MERGEBill Yi2018-12-112-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ife74efb16f80197258d9d56f26a5e8253fa9e503 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBill Yi2018-12-111-1/+1
|/ / / | | | | | | | | | | | | Change-Id: I390f4cc2cb95c7f814594b8ade8d41086e6772df Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2018-12-062-3/+3
| | | | | | | | | | | | | | | Change-Id: I8f5a587e64d849d775f31e7f3383b2ea2f7c4146 Auto-generated-cl: translation import
* | | Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212 ↵Yohei Yukawa2018-11-191-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: 91bb8ea67e am: 55327c1a62 Change-Id: I35afb8777a41a3cfadb22e99b8e459b9ccd2520f
| * | Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212Yohei Yukawa2018-11-191-0/+0
| |\| | | | | | | | | | | | | | | | am: 91bb8ea67e Change-Id: I1693b71dd6e5b9c3ad8b8d994545f77907903258
| | * Move MODULE_LICENSE_APACHE2 to the project top dirYohei Yukawa2018-11-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general files in LatinIME project should be Apache 2 license (unless some exceptional note is there). This is not limited to Java source files. Hence moving MODULE_LICENSE_APACHE2 [1] to the project top directory would make much more sense to avoid possible confusions. NOTICE file is a bit complicated because it also needs to be copied into the system image. Since the actual build rule for LatinIME.apk is placed as java/Android.bp, and notice: "../NOTICE" is something that is not supported / recommended, this CL just copies NOTICE file from java/NOTICE to the top level directory. Note also that NOTICE for LatinIME has a special notation [2]. [1]: Originally added in the following CL for Bug 2548782 If50b2e9e9cc4b4876b0d047fc9f34e2d537a6da4 443c360d0afdbab091994244f045f4756feaf2b4 [2]: Originally added in the following CL for Bug 7285172 Ib4f4e433850d3f58e0a7cef205be4dc59c7f28c4 49d301e9ad470a83048e0a5093cd88e54dd491be Test: Locally verified as follows: lunch aosp_taimen-userdebug make -j cat $OUT/obj/NOTICE_FILES/src/system/app/LatinIME/LatinIME.apk.txt Change-Id: I0ca84c46125de7f86f9e26906e107ac9ad7af177
| * | Merge "Convert to Android.bp" am: 128f68acb2Dan Willemsen2018-11-082-46/+46
| |\| | | | | | | | | | | | | | | | am: 8e315deff9 Change-Id: I9d256889dbc4717293cff2b0ddd6e867ae54e47d
| | * Convert to Android.bpDan Willemsen2018-11-012-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Test: cd packages/inputmethods/LatinIME; mma Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054 Merged-In: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
* | | Bump targetSdkVersion to "28" and minSdkVersion to "21"Yohei Yukawa2018-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this CL, targetSdkVersion and minSdkVersion will be bumped as follows: targetSdkVersion: 23 -> 28 minSdkVersion: 14 -> 21 As far as we know, there should be no user-visible behavior change on supported OS versions. Fix: 119489995 Test: manually verified that LatinIME still is functional Change-Id: I68f1545778b0c8b44c6850f22f3f5ca25bdb6de0
* | | Re-introduce <uses-sdk> to the main AndroidManifest.xmlYohei Yukawa2018-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This logically reverts my previous CL [1], which moved <uses-sdk /> from AndroidManifest.xml to AndroidManifest_SdkVersion.xml, which was later accidentally removed during Android.bp migration [2]. Since gradle support in LatinIME is still experimental and not used in official build, it is OK to keep it broken for a while. A more important problem right now is letting LatinIME target API 28. As the first step to let LatinIME target SDK 28, <uses-sdk> will be revived in AndroidManifest.xml [1]: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc 9cd42f39eb31d4f0b9cb3a795025e8ab3663f3c8 [2]: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054 22ebec6e2e4bdf3f18023907e649c68ab8b3c7a3 Bug: 110741422 Bug: 119489995 Test: manually verified that LatinIME still is functional Change-Id: I8b04caa56fe2431c07e076fb6f97c560d5da8838
* | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-11-103-4/+4
|\ \ \
| * | | Import translations. DO NOT MERGEBill Yi2018-11-093-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I2cf19a83bd266325c4a1b37344bdab61753cdbca Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBill Yi2018-11-101-1/+1
|/ / / | | | | | | | | | | | | Change-Id: Iec7f8162a5f1fa6323b5aaad028982d27ae4d703 Auto-generated-cl: translation import
* | | Convert to Android.bpDan Willemsen2018-10-313-70/+44
| | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Test: cd packages/inputmethods/LatinIME; mma Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
* | | Merge "Fix dicttool build" am: a92d0f9262 am: 438a303732Tadashi G. Takaoka2018-10-311-0/+3
|\| | | | | | | | | | | | | | | | | am: 6aed05232b Change-Id: I558fb5ff22a7428d1d82eac82b4caba469ed48d4
| * | Merge "Fix dicttool build" am: a92d0f9262Tadashi G. Takaoka2018-10-311-0/+3
| |\| | | | | | | | | | | | | | | | am: 438a303732 Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
| | * Fix dicttool buildTadashi G. Takaoka2018-10-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL partially reverts - Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c - I05c7d8429e8d9a26139456763c77997340fea8c2 And followup (remove shortcut support) - I73b7dc008a5acaf75a31a36a2d332b5afabd82d0 Bug: 28255684 Test: make -j10 dicttool_aosp Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1
| | * Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-10-141-1/+1
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-10-131-1/+1
| | |/ | |/| | | | | | | | | | Change-Id: I521ffadf560fd919a12387844ba6799a024884b1 Auto-generated-cl: translation import
| | * Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-10-141-1/+1
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-10-131-1/+1
| | |/ | |/| | | | | | | | | | Change-Id: I0606bc4b8d8c37ef386f1af4764a6887b86017f5 Auto-generated-cl: translation import
| | * Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-10-1443-150/+150
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-10-1343-150/+150
| | |/ | |/| | | | | | | | | | Change-Id: Id26d6b48ca52c631b3f2041682663f07b49e4b80 Auto-generated-cl: translation import
| | * Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-10-1413-18/+18
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-10-1313-18/+18
| | |/ | |/| | | | | | | | | | Change-Id: I76dbccb4e65ebb99db55049222d6fe361d08d9fc Auto-generated-cl: translation import
| | * Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-10-142-2/+2
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-10-132-2/+2
| | |/ | |/| | | | | | | | | | Change-Id: I915ddb171c85d7f9f1428bb52e60727a9e254a60 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBill Yi2018-10-1316-42/+42
| |/ | | | | | | | | Change-Id: Id8ca0f5d84e52df495611542f8c52e63329d531a Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-10-252-5/+5
| | | | | | | | | | Change-Id: I60b4bb2939b9e6bb73072b3c2e96ca197c41f6f2 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-09-281-1/+1
| | | | | | | | | | Change-Id: I46a499dd1da79f06718cddfd3eafed8123a05967 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-09-261-1/+1
| | | | | | | | | | Change-Id: Ib23c52e3e48c46d621a99838f101982d17308d43 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-09-211-3/+3
| | | | | | | | | | Change-Id: Ie1e3f7f1f5c270873cecd1b84cffbb2998a09423 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-08-305-9/+9
| | | | | | | | | | Change-Id: Ic2ea9113d32f5c0e0a13ab87b0dca6f71ea3dd78 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-08-071-1/+1
| | | | | | | | | | Change-Id: Ie86b819785a70d5613155360f4551c77b6bf0fd0 Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-08-021-1/+1
|\ \
| * | Import translations. DO NOT MERGEBill Yi2018-08-011-1/+1
| | | | | | | | | | | | | | | Change-Id: Ifaf4318866c3ba72adee1190e0dfce8506fbd7b0 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2018-08-011-1/+1
|/ / | | | | | | | | Change-Id: I4d394e997b58cd7dd2768861a3da887fdb7c1c6d Auto-generated-cl: translation import