aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | | | | Snap for 4916303 from 992d47a237b1e2c8ca5d301397a0525f17252497 to ↵android-build-team Robot2018-07-275-9/+9
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr1-release Change-Id: I9e6d882649e912cd49d6144d077d4eceed0df84d
* | | | | | | | | | | | 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-192-0/+192
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 91bb8ea67e am: 55327c1a62 Change-Id: I35afb8777a41a3cfadb22e99b8e459b9ccd2520f
| * | | | | | | | | | | Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212Yohei Yukawa2018-11-192-0/+192
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 91bb8ea67e Change-Id: I1693b71dd6e5b9c3ad8b8d994545f77907903258
| | * | | | | | | | | | Merge "Move MODULE_LICENSE_APACHE2 to the project top dir"Yohei Yukawa2018-11-192-0/+192
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a9cc446212 Change-Id: I541ea272535ee39422530cb143643c3301dcf198
| | | * | | | | | | | | Merge "Move MODULE_LICENSE_APACHE2 to the project top dir"Treehugger Robot2018-11-202-0/+192
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Move MODULE_LICENSE_APACHE2 to the project top dirYohei Yukawa2018-11-192-0/+192
| | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Bump targetSdkVersion to "28" and minSdkVersion to "21"Yohei Yukawa2018-11-133-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-132-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2018-11-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f1f7f05512 -s ours am: 465e4e5770 -s ours Change-Id: I9949a881f6494021964a608b83c7824a32f6f716
| * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-11-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f1f7f05512 -s ours Change-Id: I0b994052232b5b9d0c8a2e7831405b46154b666f
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-11-101-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-11-091-2/+2
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6dd75f52e619fdc8c3d54ea223f0e35171b3bc1c
* | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-11-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-11-101-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec7f8162a5f1fa6323b5aaad028982d27ae4d703 Auto-generated-cl: translation import
* | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9727374039 -s oursBill Yi2018-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | am: 61cef80d90 -s ours Change-Id: I8096fbbb94b2aadea71f0f632e17ccc2ad208ba2
| * | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-11-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9727374039 -s ours Change-Id: I89930319804866d4828517d06941049afb70412c
| | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-11-101-1/+1
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: If1a85bd7e787396faf8fb780a96e598c81dc4087
* | | | | | | | | | | [automerger skipped] Merge "Convert to Android.bp" am: 128f68acb2 am: 8e315deff9Dan Willemsen2018-11-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 948cbbe986 -s ours Change-Id: I3d252fbba6968af7dcc3d9d6be16a0d2d8b062a7
| * | | | | | | | | | Merge "Convert to Android.bp" am: 128f68acb2Dan Willemsen2018-11-0839-1081/+533
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8e315deff9 Change-Id: I9d256889dbc4717293cff2b0ddd6e867ae54e47d
| | * | | | | | | | | Merge "Convert to Android.bp"Dan Willemsen2018-11-0839-1081/+533
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 128f68acb2 Change-Id: I368f3b987cf1930d745edbd9c4740e61cee9b223
| | | * | | | | | | | Merge "Convert to Android.bp"Treehugger Robot2018-11-0939-1081/+533
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Convert to Android.bpDan Willemsen2018-11-0139-1081/+533
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Test: cd packages/inputmethods/LatinIME; mma Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054 Merged-In: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
* | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 2a04a34ee7 -s oursBill Yi2018-11-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a244f80898 -s ours Change-Id: Icb287f1dfd3ffba060a077cf745a7854512578d2
| * | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-11-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2a04a34ee7 -s ours Change-Id: I816243c0ed8b9eb9fb26d266154162f3bf0c392d
| | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I075d4469fed4c68a77c131c2f9d76ec283fe0b04
* | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 13611e7a26 -s oursBill Yi2018-11-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 36d1eed8fc -s ours Change-Id: Ia8943cea6e03d2fcaa4269b9f521fef105d3d856
| * | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-11-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 13611e7a26 -s ours Change-Id: I3c42d26416feedb8b7bfb9862744fcd0c22da76d
| | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-11-021-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I42759929af5c662c4b5d306b4967e67f5ad05547
* | | | | | | | | | Convert to Android.bpDan Willemsen2018-10-3141-1089/+537
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3112-61/+1193
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6aed05232b Change-Id: I558fb5ff22a7428d1d82eac82b4caba469ed48d4
| * | | | | | | | | Merge "Fix dicttool build" am: a92d0f9262Tadashi G. Takaoka2018-10-3112-61/+1193
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 438a303732 Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
| | * | | | | | | | Merge "Fix dicttool build"Tadashi G. Takaoka2018-10-3112-61/+1193
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a92d0f9262 Change-Id: I154c551c433cc8ef4a17268d57429e38ab962be0
| | | * | | | | | | Merge "Fix dicttool build"Treehugger Robot2018-10-3112-61/+1193
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix dicttool buildTadashi G. Takaoka2018-10-2912-61/+1193
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL partially reverts - Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c - I05c7d8429e8d9a26139456763c77997340fea8c2 And followup (remove shortcut support) - I73b7dc008a5acaf75a31a36a2d332b5afabd82d0 Bug: 28255684 Test: make -j10 dicttool_aosp Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1
* | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9855237563 -s oursBill Yi2018-10-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9468765b14 -s ours Change-Id: I48bf7fc388d08dbc9c9b886d3f7b72f75e3979c7
| * | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-10-290-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9855237563 -s ours Change-Id: I9c79f7537f938ffb2ad35aa10e90da11bf33ee19
| | * | | | | | | | Import translations. DO NOT MERGEBill Yi2018-10-281-3/+3
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I27785eae6f6e44e130a7cad0cfedeb8ed630e95f
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-10-252-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60b4bb2939b9e6bb73072b3c2e96ca197c41f6f2 Auto-generated-cl: translation import
* | | | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c42acc5344 -s ours am: 49962938cd -s ours am: e9c8624a2d -s ours Change-Id: I2b11a4ba4addf06b9a0f3e305e7a199f3b2a377b
| * | | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c42acc5344 -s ours am: 49962938cd -s ours Change-Id: Idbf577a6d169abc1210dd51d1ed171a15c4ec116
| | * | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c42acc5344 -s ours Change-Id: I3c7d427021df4d397825c057b542f86af61463bd
| | | * | | | | | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | Change-Id: I3d15592c5348f486cff59899be87a4ee0e83f49e
* | | | | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: a5a6293c3e -s ours am: 7898118eab -s ours Change-Id: I358d4586c415d5d86cb7084d5f8ed571cb86f7eb
| * | | | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: a5a6293c3e -s ours Change-Id: Ie762dbf883cdeb76d6441da58cb32d9c170c60ca
| | * | | | | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | Change-Id: I3ee77030c1d13c9ec62399268c4376989863c607
| | | * | | | | | Snap for 4818837 from 5223e55714f9a1e605c51ba577907314655dc436 to pi-releaseandroid-build-team Robot2018-06-041-1/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia993f2638850bfccbe2748634ecb4357d4155cd9
| | | * \ \ \ \ \ \ Snap for 4807121 from 6f52cfc821550b19149916fad217bba4826e8db8 to pi-releaseandroid-build-team Robot2018-05-272-6/+6
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c0db5d9020b9919b1e9992298e0d81f19a79a61