Commit Graph

41374 Commits (2a4aba08790fc275cc3d3486986c5571d653b054)

Author SHA1 Message Date
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 03a08ce11f [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 06c8063be0 -s ours
am: dcf087ef89 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0a48e342779f72c9056d1b17d844da6dca55b86
2019-01-13 16:48:13 -08: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 93955b0dbf [automerger skipped] Import translations. DO NOT MERGE am: 54b7ed4a9d -s ours
am: d4290f3b50 -s ours
am skip reason: subject contains skip directive

Change-Id: I8f5d2f0f24a2ef3f7f6f3ec96230a794110be1ea
2019-01-13 16:26:09 -08: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
TreeHugger Robot d9bca3f150 Merge "Import translations. DO NOT MERGE" 2019-01-12 06:15:26 +00:00
Bill Yi b4ca13697f Import translations. DO NOT MERGE
Change-Id: I57c8de2acc020fdb8d30f8cdc6f5b616acc98eab
Auto-generated-cl: translation import
2019-01-11 14:14:06 -08:00
Bill Yi b6b44c113b Import translations. DO NOT MERGE
Change-Id: I23b6acdfb44a25c8136764c6b1b254dd54e363a2
Auto-generated-cl: translation import
2019-01-11 14:13:56 -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
TreeHugger Robot 47285c687d Merge "Migrate packages/inputmethods/LatinIME to androidx.test" 2019-01-04 23:01:40 +00:00
Bill Yi 328d0b6ffb [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 2d2288f37c -s ours
am: fde4ac8f22  -s ours

Change-Id: I84400735f5eef0ebb7f0e94e21fc616200106ee8
2018-12-28 14:15:47 -08: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 69769a3384 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ba23f94b7b -s ours
am: fe242b4e99  -s ours

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

Change-Id: Idd10d0c06b9f7c5ae8058248d8bc689a179cf626
2018-12-28 12:24:52 -08: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 641b33492f [automerger skipped] Import translations. DO NOT MERGE am: 3d3c1cd8bc -s ours
am: 6cb7229dd1  -s ours

Change-Id: Ie962b85fcf45bcd615e278538985b95e848c65cc
2018-12-28 12:24:09 -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
Brett Chabot c05a70a4ca Migrate packages/inputmethods/LatinIME to androidx.test
See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: I63edeced1465725cd8d6467cd75ea1acc2608932
2018-12-13 19:06:42 -08:00
Chih-Hung Hsieh f7b80bb317 Merge "Fix performance-for-range-copy warnings" am: db2e4888f8 am: 947f8ee063
am: 535cd61e63

Change-Id: Ic8ee8523a644b283ef0c9592bb66bf09ca541485
2018-12-11 16:36:28 -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 fd6a4b36d1 Merge "Import translations. DO NOT MERGE" 2018-12-11 21:17:52 +00: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
Bill Yi 8f8172dbae Import translations. DO NOT MERGE
Change-Id: Ife74efb16f80197258d9d56f26a5e8253fa9e503
Auto-generated-cl: translation import
2018-12-11 10:26:44 -08:00
Bill Yi f40e90e607 Import translations. DO NOT MERGE
Change-Id: I390f4cc2cb95c7f814594b8ade8d41086e6772df
Auto-generated-cl: translation import
2018-12-11 10:26:31 -08:00
The Android Open Source Project d0f85c439d [automerger skipped] Merge "DO NOT MERGE" am: 55748c5936 -s ours am: 49424a1b52 -s ours
am: 6c06f06079  -s ours

Change-Id: I236b7d0b61ee39ce04eb7344ccbeb81fc0decd68
2018-12-06 18:47:03 -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 633282d3f3 Import translations. DO NOT MERGE
Change-Id: I8f5a587e64d849d775f31e7f3383b2ea2f7c4146
Auto-generated-cl: translation import
2018-12-06 07:51:38 -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 b6ad3b8cbd Merge "Move MODULE_LICENSE_APACHE2 to the project top dir" am: a9cc446212 am: 91bb8ea67e
am: 55327c1a62

Change-Id: I35afb8777a41a3cfadb22e99b8e459b9ccd2520f
2018-11-19 23:33:36 -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