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

38162 commits

This branch
This branch
All branches
Author SHA1 Message Date
Geoff Mendal
c9664084c7 am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f72e120216d591f6ed1a9aa69d34009d69848108':
  Import translations. DO NOT MERGE
 2015-07-15 17:08:40 +00:00
Geoff Mendal
e45179a2af am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a6d8425760ff3e10f3351545ac7e01e8626fdd8c':
  Import translations. DO NOT MERGE
 2015-07-15 17:08:37 +00:00
Geoff Mendal
4a44f43348 am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'd6cba73e4c0ec4c4f2f47957873f0983620ff9c4':
  Import translations. DO NOT MERGE
 2015-07-15 17:08:35 +00:00
Geoff Mendal
b8d881f250 am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'cce9728e2b838642c85e30978854793b481954d2':
  Import translations. DO NOT MERGE
 2015-07-15 17:08:33 +00:00
Geoff Mendal
63917040f1 am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '74d4fdc31c8b3893c498c26e833eabe86f03fb57':
  Import translations. DO NOT MERGE
 2015-07-15 17:08:32 +00:00
Geoff Mendal
cc34158af0 am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE 
* commit '16ad0293117e18b90d4140a4e3241cd84a1f28a9':
  Import translations. DO NOT MERGE
 2015-07-15 17:08:30 +00:00
Qiwen Zhao
247aef7564 am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe. 
* commit '490701a3feb84f73e5af9a2c4740f4d4be8455b7':
 2015-07-15 17:08:30 +00:00
Geoff Mendal
f72e120216 am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '6aea6b9da7b779ff5f08da631f30bc5f177a3423':
  Import translations. DO NOT MERGE
 2015-07-15 16:54:10 +00:00
Geoff Mendal
a6d8425760 am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434':
  Import translations. DO NOT MERGE
 2015-07-15 16:54:09 +00:00
Geoff Mendal
d6cba73e4c am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c8e261e95bd78ab2a3926d030c0525eba0fd8ca7':
  Import translations. DO NOT MERGE
 2015-07-15 16:54:08 +00:00
Geoff Mendal
cce9728e2b am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'cf849b40df13546046d3d7c89dc63c3e8b354976':
  Import translations. DO NOT MERGE
 2015-07-15 16:54:06 +00:00
Geoff Mendal
74d4fdc31c am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '29217bcd651d1ab968d01744533aec009fe252da':
  Import translations. DO NOT MERGE
 2015-07-15 16:54:05 +00:00
Geoff Mendal
16ad029311 am 285c9d82: (-s ours) Import translations. DO NOT MERGE 
* commit '285c9d825d53a76548079ad527c4c79fda69ada1':
  Import translations. DO NOT MERGE
 2015-07-15 16:54:03 +00:00
Geoff Mendal
6aea6b9da7 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:47:56 +00:00
Geoff Mendal
1aceaa3c2b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:47:44 +00:00
Geoff Mendal
c8e261e95b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:46:10 +00:00
Geoff Mendal
cf849b40df Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:44:45 +00:00
Geoff Mendal
29217bcd65 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:41:49 +00:00
Geoff Mendal
90a6cdb26a Import translations. DO NOT MERGE 
Change-Id: I922b3fb60a57db87c8bf1da3d3cd7fa976d9f5f9
Auto-generated-cl: translation import
 2015-07-15 09:37:13 -07:00
Geoff Mendal
8b8df7dcf1 Import translations. DO NOT MERGE 
Change-Id: I1ce33d32d058d27eae565c1e982b491372878d25
Auto-generated-cl: translation import
 2015-07-15 09:34:54 -07:00
Geoff Mendal
41bffb1293 Import translations. DO NOT MERGE 
Change-Id: Id1d45fb3ba0b84c8574bd8e326c62f2417660ce3
Auto-generated-cl: translation import
 2015-07-15 09:33:27 -07:00
Geoff Mendal
e3e9026a3a Import translations. DO NOT MERGE 
Change-Id: Id4a9a90498ece00ba399074bef4010ecd315aeb7
Auto-generated-cl: translation import
 2015-07-15 09:31:30 -07:00
Geoff Mendal
a00589437e Import translations. DO NOT MERGE 
Change-Id: I41b452436ee558b42b104387eb3431d8164ab766
Auto-generated-cl: translation import
 2015-07-15 09:30:20 -07:00
Geoff Mendal
285c9d825d Import translations. DO NOT MERGE 
Change-Id: I7b33db63242fec09f647c250e66f9eef75c7b6fa
Auto-generated-cl: translation import
 2015-07-15 09:28:54 -07:00
Qiwen Zhao
e862217461 DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe 2015-07-13 16:35:27 -07:00
Qiwen Zhao
490701a3fe DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe. 2015-07-13 15:29:05 -07:00
Jatin Matani
80c9bfbd28 resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev 
Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
 2015-07-13 10:40:26 -07:00
The Android Automerger
98aaffaafe am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 
* commit 'b4b19735182767df88f3a196a94c4a943423e72b':
 2015-07-13 17:19:40 +00:00
The Android Automerger
b4b1973518 am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 
* commit '01f042ccfa4530e7be2c01dbda5ed4a296ba535e':
 2015-07-13 16:52:52 +00:00
Qiwen Zhao
c8edecc543 am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev 
* commit '32afc638e9aed9a80cd25d0884406b7394a6ac60':
  Remove android.util.Log from FileUtils
 2015-07-13 16:20:59 +00:00
Qiwen Zhao
32afc638e9 Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev 2015-07-13 16:10:21 +00:00
Geoff Mendal
4203b5d8d8 am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '85a156223ceee5340ca7b6c31854d2e7ec38e0ff':
  Import translations. DO NOT MERGE
 2015-07-13 15:09:37 +00:00
Geoff Mendal
7bceb2e379 am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '0975cce068471874de7004b1bfb73f76b06bbe05':
  Import translations. DO NOT MERGE
 2015-07-13 15:09:36 +00:00
Geoff Mendal
d28a54a831 am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'b2fe54720bcf1d233f837e8528c344f6375177ee':
  Import translations. DO NOT MERGE
 2015-07-13 15:09:34 +00:00
Geoff Mendal
83c781e46c am 98c4eba2: (-s ours) Import translations. DO NOT MERGE 
* commit '98c4eba2cea310863f551af07a9c122e50ef425d':
  Import translations. DO NOT MERGE
 2015-07-13 15:09:33 +00:00
Jatin Matani
0dacfff5d1 resolved conflicts for merge of d711426a to mnc-dr-dev 
Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d
 2015-07-13 03:01:27 -07:00
Geoff Mendal
85a156223c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-11 17:02:40 +00:00
Geoff Mendal
284b504146 Import translations. DO NOT MERGE 
Change-Id: Idbbfc3e5aa4f2f55e848e117da6f6b553323b971
Auto-generated-cl: translation import
 2015-07-11 09:59:49 -07:00
Geoff Mendal
0975cce068 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-11 16:57:33 +00:00
Geoff Mendal
15bf32100f Import translations. DO NOT MERGE 
Change-Id: I8686627b551188696543ab94fff742a02e6e27cc
Auto-generated-cl: translation import
 2015-07-11 09:56:44 -07:00
Geoff Mendal
b2fe54720b Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-11 16:56:12 +00:00
Geoff Mendal
bcbb0779e5 Import translations. DO NOT MERGE 
Change-Id: Iaee7e2521801ec3fd3b7856b6aded0d0980f4ea7
Auto-generated-cl: translation import
 2015-07-11 09:51:45 -07:00
Geoff Mendal
98c4eba2ce Import translations. DO NOT MERGE 
Change-Id: I144d565ab22039cb3af19760ae2fde169729cfe5
Auto-generated-cl: translation import
 2015-07-11 09:50:37 -07:00
Jatin Matani
4d7a778039 am 8c2591ee: Bring back shortcuts and add to dictionary UI 
* commit '8c2591eec80dbe44158b1613cd96056057a41139':
  Bring back shortcuts and add to dictionary UI
 2015-07-11 02:28:19 +00:00
Jatin Matani
9cd60fe1bb keep history after reset to ub-latinimegoogle-fava-release 
This build IS suitable for public release
 2015-07-10 19:45:20 +00:00
The Android Automerger
01f042ccfa merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-07-09 21:06:58 +00:00
Jatin Matani
d711426a87 Remove android.util.Log from FileUtils 
FileUtils is being used for other non android projects
and hence breaks when built. Instead use the log statements
at caller to record Log.e messages. Hence there is no side
effect here.

Bug:22042371
Change-Id: Ieb100006ff38e013bc30542637465f58bfc0f2f2
 2015-07-09 11:50:10 -07:00
The Android Automerger
a48d1b0e35 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-07-07 19:00:33 +00:00
Jatin Matani
8c2591eec8 Bring back shortcuts and add to dictionary UI 
For JB and lower devices, the UI is surfaced by the IME.
Bug: 22200135
Change-Id: Icca08500ee0683e2ceb5357b0bc430cd1712220e
 2015-07-06 17:32:13 -07:00
Baligh Uddin
baec6ce1ab Revert reset to ub-latinimegoogle-fava-release 2015-07-01 05:39:20 -07:00