Commit Graph

41132 Commits (8f8172dbaed9d246d3eb03cd693b2492328b1e93)

Author SHA1 Message Date
Bill Yi 8f8172dbae Import translations. DO NOT MERGE
Change-Id: Ife74efb16f80197258d9d56f26a5e8253fa9e503
Auto-generated-cl: translation import
2018-12-11 10:26:44 -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
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
      9cd42f39eb
 [2]: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
      22ebec6e2e

Bug: 110741422
Bug: 119489995
Test: manually verified that LatinIME still is functional
Change-Id: I8b04caa56fe2431c07e076fb6f97c560d5da8838
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  -s ours

Change-Id: I9949a881f6494021964a608b83c7824a32f6f716
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  -s ours

Change-Id: I8096fbbb94b2aadea71f0f632e17ccc2ad208ba2
2018-11-10 06:56:02 -08: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 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  -s ours

Change-Id: I3d252fbba6968af7dcc3d9d6be16a0d2d8b062a7
2018-11-08 17:15:09 -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
Bill Yi 31dd19aa86 [automerger skipped] Import translations. DO NOT MERGE am: 2a04a34ee7 -s ours
am: a244f80898  -s ours

Change-Id: Icb287f1dfd3ffba060a077cf745a7854512578d2
2018-11-06 07:03:18 -08: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 23e7ffb238 [automerger skipped] Import translations. DO NOT MERGE am: 13611e7a26 -s ours
am: 36d1eed8fc  -s ours

Change-Id: Ia8943cea6e03d2fcaa4269b9f521fef105d3d856
2018-11-02 21:07:12 -07: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
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

Change-Id: I558fb5ff22a7428d1d82eac82b4caba469ed48d4
2018-10-31 09:24:08 -07: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
Bill Yi fd7874f153 [automerger skipped] Import translations. DO NOT MERGE am: 9855237563 -s ours
am: 9468765b14  -s ours

Change-Id: I48bf7fc388d08dbc9c9b886d3f7b72f75e3979c7
2018-10-29 11:57:50 -07: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 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  -s ours

Change-Id: I2b11a4ba4addf06b9a0f3e305e7a199f3b2a377b
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  -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