68c112b652
am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '63917040f1143c036ff480cee3e26790eaddb263':
Import translations. DO NOT MERGE
2015-07-15 17:17:31 +00:00
983dcbd1f8
am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cc34158af0bf5318a33d74fed3e01de32a62149a':
Import translations. DO NOT MERGE
2015-07-15 17:17:29 +00:00
16b9a0ba09
am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
...
* commit '247aef7564be66179a988e74bd695c324e36f6dd':
2015-07-15 17:17:27 +00:00
2bc2b351eb
am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
...
* commit 'e862217461bdf0d460b71d80b800a86be1eb61fc':
2015-07-15 17:17:27 +00:00
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
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
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
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
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
29217bcd65
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-07-15 16:41:49 +00:00
a00589437e
Import translations. DO NOT MERGE
...
Change-Id: I41b452436ee558b42b104387eb3431d8164ab766
Auto-generated-cl: translation import
2015-07-15 09:30:20 -07:00
285c9d825d
Import translations. DO NOT MERGE
...
Change-Id: I7b33db63242fec09f647c250e66f9eef75c7b6fa
Auto-generated-cl: translation import
2015-07-15 09:28:54 -07:00
1d1441d32a
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
2015-07-13 16:40:05 -07:00
e862217461
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
2015-07-13 16:35:27 -07:00
490701a3fe
DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
2015-07-13 15:29:05 -07:00
80c9bfbd28
resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev
...
Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0
2015-07-13 10:40:26 -07:00
1e14b4597f
am 98aaffaa: am b4b19735: am 01f042cc: merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
...
* commit '98aaffaafe9246f7e3b2aff4ff605b5fbbed9f69':
2015-07-13 17:29:50 +00:00
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
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
741b6acbf8
am c8edecc5: am 32afc638: Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
...
* commit 'c8edecc5432d8b1d7c487d7a6f3bc6339358afaa':
Remove android.util.Log from FileUtils
2015-07-13 16:32:52 +00:00
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
32afc638e9
Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev
2015-07-13 16:10:21 +00:00
2676508c49
am 4203b5d8: (-s ours) am 85a15622: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '4203b5d8d84592d78dd05db7ab0d8fb9845a3e4e':
Import translations. DO NOT MERGE
2015-07-13 15:32:40 +00:00
1bea2964fa
am 7bceb2e3: (-s ours) am 0975cce0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '7bceb2e3791a2c4d010fd770eceef203099f2a11':
Import translations. DO NOT MERGE
2015-07-13 15:32:38 +00:00
5b704f8457
am d28a54a8: (-s ours) am b2fe5472: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'd28a54a8315d10c78c4c40bfdd8ce5ce8be10fb9':
Import translations. DO NOT MERGE
2015-07-13 15:32:36 +00:00
9fe7781171
am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGE
...
* commit '83c781e46c3d3d186595ef0c31a3d544edfcf62a':
Import translations. DO NOT MERGE
2015-07-13 15:32:35 +00:00
c3f9f1d50b
am 4d7a7780: am 8c2591ee: Bring back shortcuts and add to dictionary UI
...
* commit '4d7a7780395a2376b566452646d1a241e165c3bf':
Bring back shortcuts and add to dictionary UI
2015-07-13 15:32:33 +00:00
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
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
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
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
0dacfff5d1
resolved conflicts for merge of d711426a to mnc-dr-dev
...
Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d
2015-07-13 03:01:27 -07:00
85a156223c
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 17:02:40 +00:00
284b504146
Import translations. DO NOT MERGE
...
Change-Id: Idbbfc3e5aa4f2f55e848e117da6f6b553323b971
Auto-generated-cl: translation import
2015-07-11 09:59:49 -07:00
0975cce068
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 16:57:33 +00:00
15bf32100f
Import translations. DO NOT MERGE
...
Change-Id: I8686627b551188696543ab94fff742a02e6e27cc
Auto-generated-cl: translation import
2015-07-11 09:56:44 -07:00
b2fe54720b
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 16:56:12 +00:00
bcbb0779e5
Import translations. DO NOT MERGE
...
Change-Id: Iaee7e2521801ec3fd3b7856b6aded0d0980f4ea7
Auto-generated-cl: translation import
2015-07-11 09:51:45 -07:00
98c4eba2ce
Import translations. DO NOT MERGE
...
Change-Id: I144d565ab22039cb3af19760ae2fde169729cfe5
Auto-generated-cl: translation import
2015-07-11 09:50:37 -07:00
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
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
01f042ccfa
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-07-09 21:06:58 +00:00
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
a48d1b0e35
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-07-07 19:00:33 +00:00
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
91886a31fb
am baec6ce1: Revert reset to ub-latinimegoogle-fava-release
...
* commit 'baec6ce1abec381f5e2e69c032ca0cd460592266': (252 commits)
Don't prompt before downloading.
Add some more logging. Why not.
Load metadata.json from resources on DB reset.
Small optimization to eliminate a >0 check in RichInputConnection.
Extend laggy connection timeout for initial load.
Fix breakage in tests.
LatinIME portion of StatsUtil change.
Workaround for preserving responsiveness on a slow InputConnection.
Do not decorate committed spans.
Do not force downloads on package replace.
Fix the previous downloads logic to not missing any downloads.
Detection and logging of slow input connections.
Clear/remove all the scheduled downloads in Download Manager
Disable download notifications.
Cleanup before fixing getTextAfterCursor().
Do not restrict downloads to WiFi networks.
Import translations. DO NOT MERGE
Revert "Remove "Personal dictionary" link from settings."
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
...
2015-07-01 16:55:31 +00:00
baec6ce1ab
Revert reset to ub-latinimegoogle-fava-release
2015-07-01 05:39:20 -07:00
395f0b6059
keep history after reset to ub-latinimegoogle-fava-release
2015-07-01 05:18:11 -07:00
fa7ab84993
merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle
2015-06-25 23:06:38 +00:00
d23dd5978d
Don't prompt before downloading.
...
We don't pay attention to the answer, so don't ask.
Bug 22069694.
Change-Id: Ic048d5570e68fbc9438c6577e27e6c7f68428606
2015-06-25 15:01:04 -07:00
Geoff Mendal
Qiwen Zhao
Jatin Matani
The Android Automerger
Baligh Uddin
Dan Zivkovic