aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 "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
* | 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
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-03-022-3/+3
|\
| * Import translations. DO NOT MERGEBill Yi2018-03-012-3/+3
| | | | | | | | | | Change-Id: I07ca65fd9e1e85ecd204a0104e96162157f4cb15 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-03-011-1/+1
|/ | | | | Change-Id: I1858b637000d24f8e388532e9cde24b92ef04dbf Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-02-222-2/+2
|\
| * Import translations. DO NOT MERGEBill Yi2018-02-222-2/+2
| | | | | | | | | | Change-Id: I0b9d7bfcf13bb94a5f2c8e0fa91a3353601d7a3c Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-02-221-1/+1
|/ | | | | Change-Id: I39f0ed6f033cfda9f6c4b6b645cf8961ebd249a2 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBill Yi2018-02-121-1/+1
| | | | | Change-Id: Ia602bd23a45aa8c167496a4ea43b16a89dfb06e8 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-02-051-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2018-02-031-1/+1
| | | | | | | | | | Change-Id: Ie5eaa55a4825ee888251b678c419367ca5110bb8 Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-02-041-2/+2
|\ \
| * | Import translations. DO NOT MERGEBill Yi2018-02-031-2/+2
| |/ | | | | | | | | Change-Id: I413a68edeae0b928a25699e8d8fd09faa6f879b1 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBill Yi2018-02-031-2/+2
|/ | | | | Change-Id: I5b377cabe9611889f3d71275d158c9206eee8924 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-01-191-2/+2
|\
| * Import translations. DO NOT MERGEBill Yi2018-01-181-2/+2
| | | | | | | | | | Change-Id: If570e0e26491142b2b7d51b36765415688cb62c9 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-01-181-1/+1
|/ | | | | Change-Id: Icb5a5bc1372c3981edee4e1330d0e45d0a8d11fb Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-01-182-4/+4
|\
| * Import translations. DO NOT MERGEBill Yi2018-01-172-4/+4
| | | | | | | | | | Change-Id: Iea5bb3e0da88af2e241348ec41fb29fb180c2e5d Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-01-171-2/+2
|/ | | | | Change-Id: I0c204214cd2fb1dac05cb42a52dacfd7ad2ad3f5 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-01-101-2/+2
|\
| * Import translations. DO NOT MERGEBill Yi2018-01-101-2/+2
| | | | | | | | | | Change-Id: If9e86550fe5c96e654ebba4a407e49cac4203187 Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-01-102-3/+3
|\ \
| * | Import translations. DO NOT MERGEBill Yi2018-01-102-3/+3
| |/ | | | | | | | | Change-Id: I5cc214bd3fa9a63a2e56aa3157b4b3db50e68049 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBill Yi2018-01-101-1/+1
|/ | | | | Change-Id: I56ab517049d2a97ff05bb40466438a41888a9cc4 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-12-202-4/+4
|\
| * Import translations. DO NOT MERGEBill Yi2017-12-192-4/+4
| | | | | | | | | | Change-Id: I47cd7bc7be3a009b204ecd509b98577d5a07ee38 Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-12-202-3/+3
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-12-192-3/+3
| |/ | | | | | | | | Change-Id: I265c7babd1e0f3d6ed7dc9ddf7779f770520cca5 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBill Yi2017-12-191-15/+15
|/ | | | | Change-Id: Id98113aaa443c1107240b4002a35a8d9e1ea129b Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-12-081-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2017-12-071-1/+1
| | | | | | | | | | Change-Id: I1fb69251a612e2f064b418a651e5c679aeb6f528 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2017-12-071-1/+1
|/ | | | | Change-Id: I23bdefa3861b985df5f0cec0cfc84e85df449e58 Auto-generated-cl: translation import