nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
40978 commits 1 branch 0 tags 363 MiB
Commit graph

40978 commits

This branch
This branch
All branches
Author SHA1 Message Date
Xin Li
c6989a55f8 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master 
Bug: 120848293
Change-Id: I0ce28bf5229c1f1c98a51d86c2eaa15ec9efa73e
 2019-02-21 09:25:08 -08:00
Xin Li
3131e40bd0 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" 
am: 7a26716635 -s ours
am skip reason: subject contains skip directive

Change-Id: I987ab9b831b98585ec81dfb09ef7c2a9e231050c
 2019-02-20 11:09:54 -08:00
Xin Li
44fd4cee32 [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master 
am: 55f3303cbb -s ours
am skip reason: subject contains skip directive

Change-Id: I6b4a32fb876ebb56043708b575cbf72b870617b8
 2019-02-20 08:53:05 -08:00
Xin Li
7a26716635 Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" 2019-02-20 16:25:59 +00:00
Xin Li
55f3303cbb DO NOT MERGE - Merge PPRL.190205.001 into master 
Bug: 124234733
Change-Id: I7e1e95d48518ba22d651ac5301f59d0576eae5f3
 2019-02-18 15:58:48 -08:00
Xin Li
edb32289f2 DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master 
Bug: 124234733
Change-Id: I7cf7739a6a70d4caeb1c20a3c1c4f33a05568670
 2019-02-12 09:53:45 -08:00
android-build-team Robot
20de0ce610 Snap for 5180536 from 556b091a75 to pi-platform-release 
Change-Id: I0d7de023eac68880bab0b670385e67b721a5abcf
 2019-02-09 02:34:49 +00:00
Anton Hansson
d894eec1ee Merge "Move LatinIME and its lib to /product" am: 149b9d4f6e 
am: 84d156b1e6

Change-Id: I386b9b5ed6ba02a4cd00efb75804ffef24603a2c
 2019-01-14 01:56:34 -08:00
Anton Hansson
84d156b1e6 Merge "Move LatinIME and its lib to /product" 
am: 149b9d4f6e

Change-Id: I8cdefaaa460ff09dfb410c5406735676669ce9c1
 2019-01-14 01:31:41 -08:00
Anton Hansson
149b9d4f6e Merge "Move LatinIME and its lib to /product" 2019-01-14 09:06:53 +00:00
Bill Yi
dcf087ef89 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 
am: 06c8063be0 -s ours
am skip reason: subject contains skip directive

Change-Id: I361ed1fa55f6dc6d7b7aee8984e61873114988fb
 2019-01-13 16:40:11 -08:00
TreeHugger Robot
06c8063be0 Merge "Import translations. DO NOT MERGE" into pi-dev 2019-01-14 00:34:29 +00:00
Bill Yi
d4290f3b50 [automerger skipped] Import translations. DO NOT MERGE 
am: 54b7ed4a9d -s ours
am skip reason: subject contains skip directive

Change-Id: Iccec905e74b8a20923ddf92db0beda0278d5cdfb
 2019-01-13 16:21:28 -08:00
Bill Yi
54b7ed4a9d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I55aec88a6c77441c68c7121cab8dcce25d5ef4cc
 2019-01-13 01:12:10 -08:00
Bill Yi
ab4f7ace74 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9baa804b18e008b1083ef970d9d3c12498364744
 2019-01-13 01:08:13 -08:00
Anton Hansson
1c429e3a09 Move LatinIME and its lib to /product 
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
 2019-01-11 15:20:31 +00:00
Bill Yi
fde4ac8f22 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 
am: 2d2288f37c  -s ours

Change-Id: I496ac1555af61b6f2e8a52074e2416ad1113a320
 2018-12-28 14:10:47 -08:00
TreeHugger Robot
2d2288f37c Merge "Import translations. DO NOT MERGE" into pi-dev 2018-12-28 22:05:37 +00:00
Bill Yi
fe242b4e99 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 
am: ba23f94b7b  -s ours

Change-Id: Ib222f7a1f0a43d6b0adea55afca349dc6bd83319
 2018-12-28 12:24:12 -08:00
Bill Yi
91f0e976a7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 
am: e921fbc7db  -s ours

Change-Id: I93766f2c63586fd097f0dd6f590bdeb73b5fdb95
 2018-12-28 12:20:57 -08:00
Bill Yi
6cb7229dd1 [automerger skipped] Import translations. DO NOT MERGE 
am: 3d3c1cd8bc  -s ours

Change-Id: I03c34a8e17282a8e2e5a02fdee1132a829d55909
 2018-12-28 12:20:05 -08:00
TreeHugger Robot
ba23f94b7b Merge "Import translations. DO NOT MERGE" into pi-dev 2018-12-28 20:17:46 +00:00
TreeHugger Robot
e921fbc7db Merge "Import translations. DO NOT MERGE" into pi-dev 2018-12-28 20:10:37 +00:00
Bill Yi
80e3014666 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id860302ad84eb62980b4a945874cb45edfdcc687
 2018-12-28 10:44:42 -08:00
Bill Yi
3d3c1cd8bc Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6c89395f7bef7820235bd25d506493ab2bd577e5
 2018-12-28 10:43:51 -08:00
Bill Yi
10af3a4c3c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1bb720f59308fd358bf855f68bec70fa4884f197
 2018-12-28 10:42:05 -08:00
Bill Yi
ddfe606cca Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iedbf75b9435c748ada110ea50847d4be9efe5f79
 2018-12-28 10:40:03 -08:00
Chih-Hung Hsieh
535cd61e63 Merge "Fix performance-for-range-copy warnings" am: db2e4888f8 
am: 947f8ee063

Change-Id: I153c9732d7fd1733f196b9807d99cfe59fcde012
 2018-12-11 16:20:39 -08:00
Chih-Hung Hsieh
947f8ee063 Merge "Fix performance-for-range-copy warnings" 
am: db2e4888f8

Change-Id: I543e720cb8f79f4464a69a4365ca28c4942e160c
 2018-12-11 14:59:57 -08:00
Treehugger Robot
db2e4888f8 Merge "Fix performance-for-range-copy warnings" 2018-12-11 21:01:25 +00:00
Chih-Hung Hsieh
895bf97d22 Fix performance-for-range-copy warnings 
Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I06021a6597705515dc7a3cb81a7fbbac7ba344a1
 2018-12-11 10:40:46 -08:00
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