Yohei Yukawa
91bb8ea67e
Merge "Move MODULE_LICENSE_APACHE2 to the project top dir"
...
am: a9cc446212
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
443c360d0a49d301e9ad
2018-11-19 12:11:31 -08:00
Yohei Yukawa
04573e30ff
Bump targetSdkVersion to "28" and minSdkVersion to "21"
...
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
2018-11-13 13:51:59 -08:00
Yohei Yukawa
69ceec9045
Re-introduce <uses-sdk> to the main AndroidManifest.xml
...
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
9cd42f39eb22ebec6e2e
2018-11-13 13:49:23 -08:00
Bill Yi
ed3de34900
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f1f7f05512 -s ours
...
am: 465e4e5770
2018-11-10 07:04:40 -08:00
TreeHugger Robot
0b6f4bb0a6
Merge "Import translations. DO NOT MERGE"
2018-11-10 15:02:17 +00:00
TreeHugger Robot
cbaa54df57
Merge "Import translations. DO NOT MERGE"
2018-11-10 14:56:20 +00:00
Bill Yi
cda6a48130
[automerger skipped] Import translations. DO NOT MERGE am: 9727374039 -s ours
...
am: 61cef80d90
2018-11-10 06:56:02 -08:00
Bill Yi
465e4e5770
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: f1f7f05512
2018-11-10 06:56:01 -08:00
Bill Yi
61cef80d90
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9727374039
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
af30ac8326
Import translations. DO NOT MERGE
...
Change-Id: Iec7f8162a5f1fa6323b5aaad028982d27ae4d703
Auto-generated-cl: translation import
2018-11-10 00:10:48 -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
Bill Yi
517e77569e
Import translations. DO NOT MERGE
...
Change-Id: I2cf19a83bd266325c4a1b37344bdab61753cdbca
Auto-generated-cl: translation import
2018-11-09 23:51:36 -08:00
Dan Willemsen
29e2bcb6c9
[automerger skipped] Merge "Convert to Android.bp" am: 128f68acb2 am: 8e315deff9
...
am: 948cbbe986
2018-11-08 17:15:09 -08:00
Dan Willemsen
948cbbe986
Merge "Convert to Android.bp" am: 128f68acb2
...
am: 8e315deff9
2018-11-08 17:03:45 -08:00
Dan Willemsen
8e315deff9
Merge "Convert to Android.bp"
...
am: 128f68acb2
2018-11-08 16:58:30 -08:00
Treehugger Robot
128f68acb2
Merge "Convert to Android.bp"
2018-11-09 00:38:40 +00:00
Bill Yi
31dd19aa86
[automerger skipped] Import translations. DO NOT MERGE am: 2a04a34ee7 -s ours
...
am: a244f80898
2018-11-06 07:03:18 -08:00
Bill Yi
a244f80898
[automerger skipped] Import translations. DO NOT MERGE
...
am: 2a04a34ee7
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
23e7ffb238
[automerger skipped] Import translations. DO NOT MERGE am: 13611e7a26 -s ours
...
am: 36d1eed8fc
2018-11-02 21:07:12 -07:00
Bill Yi
36d1eed8fc
[automerger skipped] Import translations. DO NOT MERGE
...
am: 13611e7a26
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
Dan Willemsen
22ebec6e2e
Convert to Android.bp
...
See build/soong/README.md for more information.
Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
2018-10-31 21:49:02 -07:00
Tadashi G. Takaoka
b6301306fa
Merge "Fix dicttool build" am: a92d0f9262 am: 438a303732
...
am: 6aed05232b
2018-10-31 09:24:08 -07:00
Tadashi G. Takaoka
6aed05232b
Merge "Fix dicttool build" am: a92d0f9262
...
am: 438a303732
2018-10-31 09:18:51 -07:00
Tadashi G. Takaoka
438a303732
Merge "Fix dicttool build"
...
am: a92d0f9262
2018-10-31 09:10:41 -07:00
Treehugger Robot
a92d0f9262
Merge "Fix dicttool build"
2018-10-31 15:59:23 +00:00
Bill Yi
fd7874f153
[automerger skipped] Import translations. DO NOT MERGE am: 9855237563 -s ours
...
am: 9468765b14
2018-10-29 11:57:50 -07:00
Bill Yi
9468765b14
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9855237563
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
9c8608c642
Import translations. DO NOT MERGE
...
Change-Id: I60b4bb2939b9e6bb73072b3c2e96ca197c41f6f2
Auto-generated-cl: translation import
2018-10-25 06:24:18 -07:00
Bill Yi
2c1b04d000
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c42acc5344 -s ours am: 49962938cd -s ours
...
am: e9c8624a2d
2018-10-24 19:58:54 -07:00
Bill Yi
e9c8624a2d
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c42acc5344 -s ours
...
am: 49962938cd
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
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
8daaeb0231
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: a5a6293c3e -s ours
...
am: 7898118eab
2018-10-24 09:59:08 -07:00
Bill Yi
7898118eab
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: a5a6293c3e
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
35c16df3da
Merge pi-dr1-dev to aosp-master am: 265cd16db2 am: b445ba31e3
...
am: 86c77e01ef
2018-10-19 15:46:12 -07:00
Bill Yi
86c77e01ef
Merge pi-dr1-dev to aosp-master am: 265cd16db2
...
am: b445ba31e3
2018-10-19 15:29:29 -07:00
Bill Yi
b445ba31e3
Merge pi-dr1-dev to aosp-master
...
am: 265cd16db2
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
Bill Yi
d42a395c6f
[automerger skipped] Import translations. DO NOT MERGE am: 67efbc844c -s ours
...
am: de676d6315
2018-10-15 15:46:35 -07:00
Bill Yi
de676d6315
[automerger skipped] Import translations. DO NOT MERGE
...
am: 67efbc844c
2018-10-15 15:42:30 -07:00
