nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,997 Commits
1 Branch
0 Tags
363 MiB
Commit Graph

40997 Commits (01aeedb80051193eeae07d4fa040cb3b7274bd1c)

Author SHA1 Message Date
The Android Open Source Project 6c06f06079 [automerger skipped] Merge "DO NOT MERGE" am: 55748c5936 -s ours 
am: 49424a1b52  -s ours

Change-Id: Iaf13380ed7bfbf451a004c18ef2780073fd9c3f7
 2018-12-06 18:25:07 -08:00
The Android Open Source Project 49424a1b52 [automerger skipped] Merge "DO NOT MERGE" 
am: 55748c5936  -s ours

Change-Id: Id2dad517baa422d9f304dd2203892865db632aa3
 2018-12-06 17:59:17 -08:00
Treehugger Robot 55748c5936 Merge "DO NOT MERGE" 2018-12-07 01:38:19 +00:00
The Android Open Source Project 381562f2f0 DO NOT MERGE 
Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: If64e3bbb4bced4fdfe0efa3ad4a5d12f5fdc51b3
 2018-12-06 14:11:41 -08:00
Bill Yi f82bec9095 Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release 
Change-Id: I894c39579460c43a641676528c6e1eb254f20448
 2018-11-28 18:34:56 -08:00
Yohei Yukawa 55327c1a62 Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212 
am: 91bb8ea67e

Change-Id: I1693b71dd6e5b9c3ad8b8d994545f77907903258
 2018-11-19 23:13:53 -08:00
Yohei Yukawa 91bb8ea67e Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" 
am: a9cc446212

Change-Id: I541ea272535ee39422530cb143643c3301dcf198
 2018-11-19 23:05:17 -08:00
Treehugger Robot a9cc446212 Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" 2018-11-20 06:39:23 +00:00
Yohei Yukawa 5b85311ab0 Move MODULE_LICENSE_APACHE2 to the project top dir 
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
      443c360d0a
 [2]: Originally added in the following CL for Bug 7285172
      Ib4f4e433850d3f58e0a7cef205be4dc59c7f28c4
      49d301e9ad

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
 2018-11-19 12:11:31 -08:00
android-build-team Robot 556b091a75 Snap for 5130385 from f1f7f05512 to pi-qpr2-release 
Change-Id: If2439f25f9e62fedb35c16dfcad0fe19861c288e
 2018-11-14 04:10:54 +00:00
Bill Yi 465e4e5770 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 
am: f1f7f05512  -s ours

Change-Id: I0b994052232b5b9d0c8a2e7831405b46154b666f
 2018-11-10 06:56:01 -08:00
Bill Yi 61cef80d90 [automerger skipped] Import translations. DO NOT MERGE 
am: 9727374039  -s ours

Change-Id: I89930319804866d4828517d06941049afb70412c
 2018-11-10 06:47:45 -08:00
TreeHugger Robot f1f7f05512 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-11-10 14:44:20 +00:00
Bill Yi 9727374039 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If1a85bd7e787396faf8fb780a96e598c81dc4087
 2018-11-10 00:11:52 -08:00
Bill Yi 968f11511b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6dd75f52e619fdc8c3d54ea223f0e35171b3bc1c
 2018-11-09 23:52:56 -08:00
Dan Willemsen 948cbbe986 Merge "Convert to Android.bp" am: 128f68acb2 
am: 8e315deff9

Change-Id: I9d256889dbc4717293cff2b0ddd6e867ae54e47d
 2018-11-08 17:03:45 -08:00
Dan Willemsen 8e315deff9 Merge "Convert to Android.bp" 
am: 128f68acb2

Change-Id: I368f3b987cf1930d745edbd9c4740e61cee9b223
 2018-11-08 16:58:30 -08:00
Treehugger Robot 128f68acb2 Merge "Convert to Android.bp" 2018-11-09 00:38:40 +00:00
android-build-team Robot da66c2095d Snap for 5115288 from 2a04a34ee7 to pi-qpr2-release 
Change-Id: I9dda63f33991c56765c7c1d5cc546af087f3e16c
 2018-11-07 04:06:50 +00:00
Bill Yi a244f80898 [automerger skipped] Import translations. DO NOT MERGE 
am: 2a04a34ee7  -s ours

Change-Id: I816243c0ed8b9eb9fb26d266154162f3bf0c392d
 2018-11-06 06:58:36 -08:00
Bill Yi 2a04a34ee7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I075d4469fed4c68a77c131c2f9d76ec283fe0b04
 2018-11-06 05:31:13 -08:00
Bill Yi 36d1eed8fc [automerger skipped] Import translations. DO NOT MERGE 
am: 13611e7a26  -s ours

Change-Id: I3c42d26416feedb8b7bfb9862744fcd0c22da76d
 2018-11-02 16:58:50 -07:00
Bill Yi 13611e7a26 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I42759929af5c662c4b5d306b4967e67f5ad05547
 2018-11-02 11:02:18 -07:00
Dan Willemsen a23407bf62 Convert to Android.bp 
See build/soong/README.md for more information.

Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
Merged-In: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
 2018-11-01 23:09:33 +00:00
Tadashi G. Takaoka 6aed05232b Merge "Fix dicttool build" am: a92d0f9262 
am: 438a303732

Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
 2018-10-31 09:18:51 -07:00
Tadashi G. Takaoka 438a303732 Merge "Fix dicttool build" 
am: a92d0f9262

Change-Id: I154c551c433cc8ef4a17268d57429e38ab962be0
 2018-10-31 09:10:41 -07:00
Treehugger Robot a92d0f9262 Merge "Fix dicttool build" 2018-10-31 15:59:23 +00:00
android-build-team Robot 2c3de1ee6e Snap for 5101444 from 9855237563 to pi-qpr2-release 
Change-Id: I231dc9c6d0c93dfd0cb3b0638728f9cba623628a
 2018-10-31 03:03:56 +00:00
Bill Yi 9468765b14 [automerger skipped] Import translations. DO NOT MERGE 
am: 9855237563  -s ours

Change-Id: I9c79f7537f938ffb2ad35aa10e90da11bf33ee19
 2018-10-29 11:47:38 -07:00
Tadashi G. Takaoka 6a1b37353d Fix dicttool build 
This CL partially reverts
  - Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
  - I05c7d8429e8d9a26139456763c77997340fea8c2
And followup (remove shortcut support)
  - I73b7dc008a5acaf75a31a36a2d332b5afabd82d0

Bug: 28255684
Test: make -j10 dicttool_aosp
Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1
 2018-10-29 15:59:05 +09:00
Bill Yi 9855237563 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I27785eae6f6e44e130a7cad0cfedeb8ed630e95f
 2018-10-28 14:41:50 -07:00
Bill Yi e9c8624a2d [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c42acc5344 -s ours 
am: 49962938cd  -s ours

Change-Id: Idbf577a6d169abc1210dd51d1ed171a15c4ec116
 2018-10-24 18:54:49 -07:00
Bill Yi 49962938cd [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE 
am: c42acc5344  -s ours

Change-Id: I3c7d427021df4d397825c057b542f86af61463bd
 2018-10-24 15:50:27 -07:00
Bill Yi c42acc5344 Merge pie-platform-release to aosp-master - DO NOT MERGE 
Change-Id: I3d15592c5348f486cff59899be87a4ee0e83f49e
 2018-10-24 14:47:31 -07:00
Bill Yi 7898118eab [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
am: a5a6293c3e  -s ours

Change-Id: Ie762dbf883cdeb76d6441da58cb32d9c170c60ca
 2018-10-24 09:45:44 -07:00
Bill Yi a5a6293c3e Merge pi-platform-release to stage-aosp-master - DO NOT MERGE 
Change-Id: I3ee77030c1d13c9ec62399268c4376989863c607
 2018-10-24 09:07:17 -07:00
Bill Yi 86c77e01ef Merge pi-dr1-dev to aosp-master am: 265cd16db2 
am: b445ba31e3

Change-Id: Ide69e3c6ffaf78a74428ee4627da22bdeedf1a3b
 2018-10-19 15:29:29 -07:00
Bill Yi b445ba31e3 Merge pi-dr1-dev to aosp-master 
am: 265cd16db2

Change-Id: I5299e4e7abe18f0a8d047dcf546c8e241f04d2d9
 2018-10-19 15:12:31 -07:00
Bill Yi 265cd16db2 Merge pi-dr1-dev to aosp-master 
Change-Id: I335f17b757a13ef34f4abb6fd159bcaa3574a1b2
 2018-10-19 12:20:51 -07:00
android-build-team Robot a40f3c93bb Snap for 5073521 from 67efbc844c to pi-qpr2-release 
Change-Id: I027c4c4d21d645b6fd4120fbdd6f5b27487b6817
 2018-10-17 03:05:32 +00:00
Bill Yi de676d6315 [automerger skipped] Import translations. DO NOT MERGE 
am: 67efbc844c  -s ours

Change-Id: Ic593c6d12dd7e9450a8d606a39c5ec128fb95772
 2018-10-15 15:42:30 -07:00
Bill Yi 67efbc844c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8f0f4691bcdb730d71feae0616c65f1e38b99b06
 2018-10-15 09:48:59 -07:00
Paul Duffin da077adb06 Merge "Remove paulduffin@ from OWNERS" am: e2a4d47ff2 
am: 69989d1156

Change-Id: Ie8a5d726a5250134313f436eba5b871ff1a5039b
 2018-10-15 05:13:10 -07:00
Paul Duffin 69989d1156 Merge "Remove paulduffin@ from OWNERS" 
am: e2a4d47ff2

Change-Id: I78e339ead245e67fce1233f304f01518ed61bd99
 2018-10-15 05:05:57 -07:00
Paul Duffin e2a4d47ff2 Merge "Remove paulduffin@ from OWNERS" 2018-10-15 11:52:49 +00:00
Bill Yi 6141ad5079 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: fe42418de4  -s ours

Change-Id: I04ccad51a0335212a71a0b9045a2eea6ba9495f1
 2018-10-13 19:59:49 -07:00
Bill Yi cf6ae73d4c [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 5958fb4cbc  -s ours

Change-Id: Ie64b997b3cb56737b62bdb84d6d68ed21e37f525
 2018-10-13 19:59:34 -07:00
Bill Yi 56fbe87528 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 0ca0ed10c3  -s ours

Change-Id: I7e40179518929c497f9eb88495bd7478cc3dbd00
 2018-10-13 19:59:19 -07:00
Bill Yi 221b18b183 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: f1e3e4c5a8  -s ours

Change-Id: If15f3fcb0f5857b719a7f2c9799d775c6cd2896c
 2018-10-13 19:59:04 -07:00
Bill Yi 3bd0ac6a1e [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 051ebe1f67  -s ours

Change-Id: I357d322111f9d35c1c37be17debda50e94b26e41
 2018-10-13 19:58:48 -07:00