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

40897 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
fe42418de4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:56 +00:00
TreeHugger Robot
5958fb4cbc Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:54 +00:00
TreeHugger Robot
0ca0ed10c3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:35 +00:00
TreeHugger Robot
f1e3e4c5a8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:46:38 +00:00
TreeHugger Robot
051ebe1f67 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:44:16 +00:00
Bill Yi
54e8416096 Import translations. DO NOT MERGE 
Change-Id: Id26d6b48ca52c631b3f2041682663f07b49e4b80
Auto-generated-cl: translation import
 2018-10-13 08:35:07 -07:00
Bill Yi
946631933a Import translations. DO NOT MERGE 
Change-Id: I76dbccb4e65ebb99db55049222d6fe361d08d9fc
Auto-generated-cl: translation import
 2018-10-13 08:34:10 -07:00
Bill Yi
b0fc52fca9 Import translations. DO NOT MERGE 
Change-Id: I0606bc4b8d8c37ef386f1af4764a6887b86017f5
Auto-generated-cl: translation import
 2018-10-13 08:32:35 -07:00
Bill Yi
4f8a5c0dd6 Import translations. DO NOT MERGE 
Change-Id: Id8ca0f5d84e52df495611542f8c52e63329d531a
Auto-generated-cl: translation import
 2018-10-13 08:31:41 -07:00
Bill Yi
819b30680c Import translations. DO NOT MERGE 
Change-Id: I915ddb171c85d7f9f1428bb52e60727a9e254a60
Auto-generated-cl: translation import
 2018-10-13 08:30:21 -07:00
Bill Yi
3725a3fbca Import translations. DO NOT MERGE 
Change-Id: I521ffadf560fd919a12387844ba6799a024884b1
Auto-generated-cl: translation import
 2018-10-13 08:28:46 -07:00
Paul Duffin
14720ca8cb Remove paulduffin@ from OWNERS 
Test: n/a
Change-Id: I24503d403feefbed40475660983493fb2991d9a8
 2018-10-10 16:15:41 +01:00
Chih-hung Hsieh
d4f3ede0c7 Merge "Add default code reviewers." 
am: f468c00bdf

Change-Id: I619cbeacfd8ed9812da2cfd065bf4e16b86f8492
 2018-10-05 16:43:07 -07:00
Chih-hung Hsieh
f468c00bdf Merge "Add default code reviewers." 2018-10-05 23:29:08 +00:00
Chih-Hung Hsieh
29e9618485 Add default code reviewers. 
Since they are commented out, their approval is not required,
but they could be the default or find right reviewers.

Bug: 33166666
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ic35da4cd5ecaff615731c25a3bf99df5a43ef35b
 2018-10-05 13:13:32 -07:00
Chih-Hung Hsieh
587239f195 Merge "Add noexcept to move constructors and assignment operators." 
am: 61d3a1d39b

Change-Id: I72e2f3ff7947df9648cc7227dda490e3d565362b
 2018-10-05 11:48:28 -07:00
Treehugger Robot
61d3a1d39b Merge "Add noexcept to move constructors and assignment operators." 2018-10-05 18:20:29 +00:00
Chih-Hung Hsieh
66a88a5eae Add noexcept to move constructors and assignment operators. 
Bug: 116614593
Test: build with WITH_TIDY=1
Change-Id: Ic2a04f82f36c2f7fe43109a7a74270044d227789
 2018-09-25 14:32:36 -07:00
Xin Li
efeceaa60c Merge stage-dr1-aosp-master into stage-aosp-master 
Bug: 112535855
Change-Id: Id6a0f71bed88d3d99c7155310c0079677a3473eb
 2018-08-13 13:01:20 -07:00
Xin Li
0af05508c9 Merge "Merge Android Pie into master" am: 0b6bd00834 
am: d88e3094de

Change-Id: I7203fce3851ed0fc337bc7698a93965e1f3e9b7a
 2018-08-07 18:45:43 -07:00
Xin Li
d88e3094de Merge "Merge Android Pie into master" 
am: 0b6bd00834

Change-Id: I8af512fde2f06c3e5f5b111bef4f77ba97f6873c
 2018-08-07 15:15:07 -07:00
Xin Li
0b6bd00834 Merge "Merge Android Pie into master" 2018-08-07 16:51:24 +00:00
Xin Li
1e882ed861 Merge Android Pie into master 
Bug: 112104996
Change-Id: I80533e40e18491cbd2973f76b0712f5c7adf45e4
 2018-08-06 16:51:30 -07:00
Bill Yi
bab98e72ad [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 7fee2eab02  -s ours

Change-Id: I114ae3091f30c50cc58b19e2e7e08c7d1d80bc75
 2018-08-04 18:13:18 -07:00
Bill Yi
205a2f40ba [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 9a9aec3313  -s ours

Change-Id: I1026d014d40831597ca14d94063c0cbabfb3a6e7
 2018-08-04 18:12:59 -07:00
Bill Yi
5b294cccf9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: c74fcad61b  -s ours

Change-Id: I9d29babbf47cea1bfa32aafdb5dc77b5d5eda42e
 2018-08-04 18:10:14 -07:00
Bill Yi
5511368d7e [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 957b4da1b0  -s ours

Change-Id: I52af21d975efe813b557f52e4646d7af629fe8c6
 2018-08-04 18:09:54 -07:00
Bill Yi
50ae03af3f [automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
am: 43f8f1d5fd  -s ours

Change-Id: I39362f91cd4ee42e00108d384e4ecea3f55481cc
 2018-08-04 18:09:09 -07:00
TreeHugger Robot
7fee2eab02 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-08-05 01:07:03 +00:00
TreeHugger Robot
9a9aec3313 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-08-05 01:04:58 +00:00