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

32844 commits

This branch
This branch
All branches
Author SHA1 Message Date
The Android Automerger
32351c1800 merge in master-release history after reset to master 2014-04-05 05:51:43 -07:00
Ken Wakasa
6d7cec10c6 am e2e41dc2: Merge "Revert "[CB22] Merge add and delete"" 
* commit 'e2e41dc22c3558697dae0ad89a03ce54ee206b9f':
  Revert "[CB22] Merge add and delete"
 2014-04-04 18:29:04 +00:00
Ken Wakasa
e2e41dc22c Merge "Revert "[CB22] Merge add and delete"" 2014-04-04 18:26:06 +00:00
Ken Wakasa
ef0498a8cc Revert "[CB22] Merge add and delete" 
This reverts commit f6bce235ae.

Seeing several new unit test failures after this CL. Reverting..

Change-Id: Ie97127550ee36dd4a07a36701e9c5118684dfbc5
 2014-04-04 18:25:34 +00:00
Baligh Uddin
64a4e35d24 am a179f0a3: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'a179f0a33f49efdba59cbd5c810ab5a22d6cdf70':
  Import translations. DO NOT MERGE
 2014-04-04 14:51:02 +00:00
Baligh Uddin
99c57caa84 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2014-04-04 14:45:26 +00:00
Baligh Uddin
a179f0a33f Merge "Import translations. DO NOT MERGE" 2014-04-04 14:45:23 +00:00
Ken Wakasa
68e50c287e am dcc43891: Merge "Remove redundant LOCAL_IS_HOST_MODULE assignments" 
* commit 'dcc43891e76eb3b6c1674705be60c5798bd16386':
  Remove redundant LOCAL_IS_HOST_MODULE assignments
 2014-04-04 13:46:48 +00:00
Ken Wakasa
dcc43891e7 Merge "Remove redundant LOCAL_IS_HOST_MODULE assignments" 2014-04-04 13:43:49 +00:00
Jean Chalard
40f33edaf1 am f9516b00: Merge "[IL132] Remove some calls that let a value escape." 
* commit 'f9516b00ecf25e634e2ebfe8ea35eb09bbcf5ca9':
  [IL132] Remove some calls that let a value escape.
 2014-04-04 13:38:17 +00:00
Jean Chalard
f9516b00ec Merge "[IL132] Remove some calls that let a value escape." 2014-04-04 13:33:26 +00:00
Ken Wakasa
694114feca Remove redundant LOCAL_IS_HOST_MODULE assignments 
Also, remove irrelevant LOCAL_NDK_STL_VARIANT for host modules.

Change-Id: I45e916c11f7c1f9b13956f01274a82ee7de1f558
 2014-04-04 22:32:45 +09:00
Ken Wakasa
9268c09163 am 73fe4952: Merge "32-bit dicttool" 
* commit '73fe49523b70b0cf649fa7fc0f096f91431f44f0':
  32-bit dicttool
 2014-04-04 12:37:18 +00:00
Ken Wakasa
73fe49523b Merge "32-bit dicttool" 2014-04-04 12:33:23 +00:00
Keisuke Kuroyanagi
4d13f7f386 am f3d9e036: Merge "Separate NormalDistribution from ProximityInfoUtils." 
* commit 'f3d9e0367ee22d5b205633785ad76e075011282c':
  Separate NormalDistribution from ProximityInfoUtils.
 2014-04-04 11:23:11 +00:00
Keisuke Kuroyanagi
f3d9e0367e Merge "Separate NormalDistribution from ProximityInfoUtils." 2014-04-04 11:18:27 +00:00
Ken Wakasa
3ccbf7ef08 32-bit dicttool 
As we can't easily turn on -m64 for only one module, the JNI library for
a host tool should be 32-bit, at least for now.

Change-Id: I1f001ccca1ad968a2241c0494bb70391fb11a59f
 2014-04-04 20:10:04 +09:00
Jean Chalard
9228d50ee9 am 76c930ee: Merge "[CB22] Merge add and delete" 
* commit '76c930eede66257d1b07e546ac12069ef206726a':
  [CB22] Merge add and delete
 2014-04-04 10:16:05 +00:00
Jean Chalard
76c930eede Merge "[CB22] Merge add and delete" 2014-04-04 10:10:55 +00:00
Keisuke Kuroyanagi
3bf9647a26 Separate NormalDistribution from ProximityInfoUtils. 
Bug: 13773693
Change-Id: I9e835cc92e16f8ae0e0492af0715d0ef5cd84a35
 2014-04-04 18:49:12 +09:00
Tadashi G. Takaoka
952aebc52d am fd6b1ac8: Remove ProGuard warning 
* commit 'fd6b1ac82273f51bc1ab27cc054ae6bf0ee8a4bd':
  Remove ProGuard warning
 2014-04-04 09:33:37 +00:00
Tadashi G. Takaoka
fd6b1ac822 Remove ProGuard warning 
Bug: 13662059
Change-Id: Ic90a882e82332b323bcd3617e5bc465f919bd921
 2014-04-04 17:59:26 +09:00
Tadashi G. Takaoka
4767c226ef am 9b46ddc1: Use platform default theme for activities and dialogs 
* commit '9b46ddc1d51fac37f970e108f7d93eb9ea11e1be':
  Use platform default theme for activities and dialogs
 2014-04-04 08:41:37 +00:00
Tadashi G. Takaoka
9b46ddc1d5 Use platform default theme for activities and dialogs 
Bug: 13698528
Change-Id: Ib904c911452525e3749c0eb287434b504576db5f
 2014-04-04 17:13:54 +09:00
Jean Chalard
3b8b2977a6 am f977ca6c: Merge "[CB21] More refactoring" 
* commit 'f977ca6c927ef96393181708355ac874232df291':
  [CB21] More refactoring
 2014-04-04 07:00:59 +00:00
Jean Chalard
f977ca6c92 Merge "[CB21] More refactoring" 2014-04-04 06:56:49 +00:00
Jean Chalard
e36667587d am 9298c9b1: Merge "Reset the client database on version upgrade." 
* commit '9298c9b1e110f8ca67db443e586b829ea150d59f':
  Reset the client database on version upgrade.
 2014-04-04 05:18:02 +00:00
Jean Chalard
9298c9b1e1 Merge "Reset the client database on version upgrade." 2014-04-04 05:12:02 +00:00
Jean Chalard
446fbaa020 am 4ac0904f: Merge "[CB20] Some more refactoring" 
* commit '4ac0904f83e77530938883ccf1dcb5f4f22c6a54':
  [CB20] Some more refactoring
 2014-04-04 05:08:15 +00:00
Jean Chalard
4ac0904f83 Merge "[CB20] Some more refactoring" 2014-04-04 05:03:45 +00:00
Tadashi G. Takaoka
529435352b am eb88f03f: Merge "Fix subtype count unit test due to Ic7c17d9656" 
* commit 'eb88f03f97393592611842c1de3b32c723f30b23':
  Fix subtype count unit test due to Ic7c17d9656
 2014-04-03 15:49:53 +00:00
Tadashi G. Takaoka
eb88f03f97 Merge "Fix subtype count unit test due to Ic7c17d9656" 2014-04-03 15:44:14 +00:00
Tadashi G. Takaoka
cafc8de2b2 Fix subtype count unit test due to Ic7c17d9656 
Change-Id: Id708752e0d97a78ce02623956e32b990bc2a1cfd
 2014-04-04 00:09:08 +09:00
Jean Chalard
2e5e74d367 Reset the client database on version upgrade. 
Bug: 13632164
Change-Id: Iba333db63558254d760fc80244b3c9753c26b069
 2014-04-03 23:20:20 +09:00
Jean Chalard
af029cb968 am 28a59dd0: Fix a bug with double-space-to-period 
* commit '28a59dd049bafa45de628e2cafda47bf46d9e22a':
  Fix a bug with double-space-to-period
 2014-04-03 13:59:06 +00:00
Jean Chalard
28a59dd049 Fix a bug with double-space-to-period 
Bug: 13778001
Change-Id: I3ebd57950cdfacbbcdc64ed214c0590519a0665c
 2014-04-03 22:07:57 +09:00
The Android Automerger
20f1f3b0d3 merge in master-release history after reset to master 2014-04-03 05:50:43 -07:00
Tadashi G. Takaoka
cf376a10e9 am 23431879: Merge "Add hindi_compact keyboard" 
* commit '23431879dab4a2c8b0e4324972884fe3ff7a39f9':
  Add hindi_compact keyboard
 2014-04-03 11:09:44 +00:00
Tadashi G. Takaoka
23431879da Merge "Add hindi_compact keyboard" 2014-04-03 11:05:14 +00:00
Tadashi G. Takaoka
a3804e5e10 Add hindi_compact keyboard 
Bug: 13779052
Change-Id: Ic7c17d96560501422a63340d7ce6bd8720e6c3c9
 2014-04-03 19:47:31 +09:00
Jean Chalard
9cce0824b0 am c5bd35e4: Merge "[IL131] Cleanup some cruft" 
* commit 'c5bd35e45f85d213df1dd6b35388efcc0623ae5a':
  [IL131] Cleanup some cruft
 2014-04-03 09:57:15 +00:00
Jean Chalard
c5bd35e45f Merge "[IL131] Cleanup some cruft" 2014-04-03 09:52:10 +00:00
Keisuke Kuroyanagi
221ea6781b am b600ffdb: Merge "Always close binary dicts for personalized dicts." 
* commit 'b600ffdb25b48b5e4a1062ab5aff81e28a7f49ca':
  Always close binary dicts for personalized dicts.
 2014-04-03 09:24:40 +00:00
Keisuke Kuroyanagi
b600ffdb25 Merge "Always close binary dicts for personalized dicts." 2014-04-03 09:19:49 +00:00
Tadashi G. Takaoka
ba969cc7ed am 303f4403: Refactor Devanagari key-styles 
* commit '303f440311537c1a5c7823d6de0579ccf7481a85':
  Refactor Devanagari key-styles
 2014-04-03 09:12:42 +00:00
Keisuke Kuroyanagi
fdd2db576d Always close binary dicts for personalized dicts. 
Bug: 10923130
Bug: 13664080
Change-Id: Ib247c775194a03462387994cd832b1650bfd1915
 2014-04-03 18:08:23 +09:00
Tadashi G. Takaoka
2d4d6fff60 am 87d30a76: Merge "Add keyboard layout test for API 14 and 15" 
* commit '87d30a76b1ca3b634c25c81f386189281d88253e':
  Add keyboard layout test for API 14 and 15
 2014-04-03 09:01:56 +00:00
Tadashi G. Takaoka
303f440311 Refactor Devanagari key-styles 
Change-Id: I799b04317d5b7daff4bb230294b2de474e5585eb
 2014-04-03 17:59:29 +09:00
Tadashi G. Takaoka
87d30a76b1 Merge "Add keyboard layout test for API 14 and 15" 2014-04-03 08:58:07 +00:00
Tadashi G. Takaoka
b6ca5763aa Add keyboard layout test for API 14 and 15 
Bug: 13017434
Change-Id: Iaa995ba0b6ba4caabc7c77f084f376bebc5b766e
 2014-04-03 17:49:43 +09:00