Commit graph

32368 commits

Author SHA1 Message Date
Keisuke Kuroyanagi
c6e3327f88 am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':
2015-03-20 23:19:57 +00:00
Tadashi G. Takaoka
45125cdb25 am 1f5881b7: am 9ba85413: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
* commit '1f5881b752b9b8e527b00e14150cfedd916513ce':
2015-03-20 23:19:55 +00:00
Tadashi G. Takaoka
b333044e8c am b1067103: am 633f1a5e: Merge "Use fragment for text correction preference screen" into lmp-dev
* commit 'b1067103343c9b196e0a9276f3e9f7c20b6def86':
2015-03-20 23:19:53 +00:00
Tadashi G. Takaoka
6be2c53343 am f63a044c: am a484dc84: Merge "Use fragment for gesture typing preference screen" into lmp-dev
* commit 'f63a044c6649f3cabc3b612ed5bd79b6601f52ae':
2015-03-20 23:19:49 +00:00
Tadashi G. Takaoka
79dae72f64 am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
* commit 'beffde59c36515f77946b35c2b0279413a1df69f':
2015-03-20 23:19:47 +00:00
Jean Chalard
e1d235cee8 am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
* commit 'ac82983f65626c1db3fd878ba059807166ffbe36':
2015-03-20 23:19:45 +00:00
Tadashi G. Takaoka
1e1805f5fe am c140938d: am bfcd98ed: Use fragment for input preference screen
* commit 'c140938d99b2b34e95d7e45425396f280a486043':
2015-03-20 23:19:43 +00:00
Tadashi G. Takaoka
4432dd0bf9 am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary option
* commit '26a2986581410536a98e1c311214dc90d9934546':
2015-03-20 23:19:41 +00:00
Keisuke Kuroyanagi
efeb96922a am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
* commit '370ffb424f4d03143c7e5d8186206e58e6fb4021':
2015-03-20 23:19:40 +00:00
Keisuke Kuroyanagi
1d60823c08 am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
* commit '90ac50ee433d7ecb1a89da242d0d99b882169d17':
2015-03-20 23:19:38 +00:00
Keisuke Kuroyanagi
17e21da36e am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
* commit '16665da28091f977e92dd0382eb3adefc8478f36':
2015-03-20 23:19:36 +00:00
Tim Murray
052556d16b am da9cc773: resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
  Use default compiler flags for dicttool.
2015-03-20 23:19:19 +00:00
Geoff Mendal
c84e354cfd am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'ca58fb9c0bbe31f8d626c0c2dab39569b6a03d5a':
  Import translations. DO NOT MERGE
2015-01-29 01:11:45 +00:00
Geoff Mendal
01c2e28b66 am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '9206174e6ba94bb2b11871c983c74989684ecf4f':
  Import translations. DO NOT MERGE
2015-01-29 01:11:43 +00:00
Geoff Mendal
55e201fa7c am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'a9431f676d472cb6b103f9d99e9c64de7d161f57':
  Import translations. DO NOT MERGE
2015-01-29 01:11:41 +00:00
Geoff Mendal
813f6d801f am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'a2fd9c6cdd094e6a076949129c01ca6d10d6fa24':
  Import translations. DO NOT MERGE
2015-01-29 01:11:39 +00:00
Geoff Mendal
97c66ce52d am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '5bc30df7e03f9354a03d9a5f7819cd3bdae18201':
  Import translations. DO NOT MERGE
2015-01-29 01:11:38 +00:00
Geoff Mendal
72e69bd96c am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'cad0777a4bade34d6bedd096eae712e29df99fc1':
  Import translations. DO NOT MERGE
2015-01-29 01:11:37 +00:00
Geoff Mendal
7b5472bfab am 31d085ff: (-s ours) Import translations. DO NOT MERGE
* commit '31d085ffca82a7927f8d25f41916b09c1a6e9fbc':
  Import translations. DO NOT MERGE
2015-01-29 01:11:35 +00:00
Geoff Mendal
ca58fb9c0b Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-29 01:06:18 +00:00
Geoff Mendal
9206174e6b Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-29 01:05:55 +00:00
Geoff Mendal
a9431f676d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-29 01:05:39 +00:00
Geoff Mendal
a2fd9c6cdd Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-29 01:05:18 +00:00
Geoff Mendal
5bc30df7e0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-29 01:04:57 +00:00
Geoff Mendal
cad0777a4b Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-29 01:04:16 +00:00
Geoff Mendal
994944adda Import translations. DO NOT MERGE
Change-Id: Id4c91d74424104f77e25d07e8852339caa6a0f97
Auto-generated-cl: translation import
2015-01-28 17:03:49 -08:00
Geoff Mendal
ed42727493 Import translations. DO NOT MERGE
Change-Id: I678822c97755e3f9bf00aa0d6622b082bee74335
Auto-generated-cl: translation import
2015-01-28 17:02:42 -08:00
Geoff Mendal
79f4572a31 Import translations. DO NOT MERGE
Change-Id: I40995ffa826f56b4bb210d274395b67c80c0db7e
Auto-generated-cl: translation import
2015-01-28 17:01:59 -08:00
Geoff Mendal
8d0b0e67d2 Import translations. DO NOT MERGE
Change-Id: I03f9178e637255e5e3bd3f6ca75b922c49bb0ce1
Auto-generated-cl: translation import
2015-01-28 17:01:14 -08:00
Geoff Mendal
b150f5e3fa Import translations. DO NOT MERGE
Change-Id: I2e23417560e24487e2421c632b956acecb78685a
Auto-generated-cl: translation import
2015-01-28 17:00:42 -08:00
Geoff Mendal
38b2ac82fc Import translations. DO NOT MERGE
Change-Id: Ib3c761dfca6acc7b2ca23838e777ed702f49f7e8
Auto-generated-cl: translation import
2015-01-28 17:00:08 -08:00
Geoff Mendal
31d085ffca Import translations. DO NOT MERGE
Change-Id: Ib4a377f96214ed7292cb0ff3e2815f1c864cc1bb
Auto-generated-cl: translation import
2015-01-28 16:59:02 -08:00
Tadashi G. Takaoka
b348d9cc57 am 943db315: (DO NOT MERGE) Fix Greek accented upper case letters
* commit '943db315f55db7ef86dc0f78b6354238422039d8':
  (DO NOT MERGE) Fix Greek accented upper case letters
2014-11-21 17:04:06 +00:00
Tadashi G. Takaoka
943db315f5 (DO NOT MERGE) Fix Greek accented upper case letters
Cherry-picked 6fc92899d82f4d3cb30f7bb2c57133154f0babd2 from
ub-latinimegoogle-edamame-mr1-release.

Bug: 18418991
Change-Id: Id4dff41ba488635ff9af899be6d4f84ab00a96c8
2014-11-21 15:14:46 +09:00
Sandeep Siddhartha
d4662983d8 Fix restore from keyboard
automerge: e551539

* commit 'e5515395f11ce3f6ba5ddebb1fc029c51f51b8b3':
  Fix restore from keyboard
2014-11-07 18:43:17 +00:00
Sandeep Siddhartha
e5515395f1 Fix restore from keyboard
The keyboard starts up before the restore process and the default shared
preferences are cached and used even after the restore.

Bug: 17837918
Change-Id: I2669e377b6e95813657fd6a80fbff4472330e3aa
(cherry picked from commit e9d814674b)
2014-11-07 02:54:14 +00:00
Baligh Uddin
2ffe6a2340 am d25f8443: (-s ours) am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'd25f8443ebf3ec5adb28ae6e24c3d17f6a0bdf7b':
  Import translations. DO NOT MERGE
2014-10-19 22:37:20 +00:00
Baligh Uddin
821db73793 am 93d67f65: (-s ours) am 6949eb15: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '93d67f65ac2d154a29dc7afdc6ae039b98fd07fd':
  Import translations. DO NOT MERGE
2014-10-19 22:37:18 +00:00
Baligh Uddin
6912dc5f33 am ffd0f4d5: (-s ours) am 6f1de7e5: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'ffd0f4d5e753c936455a7bedd6c6d83912ce6ae0':
  Import translations. DO NOT MERGE
2014-10-19 22:37:17 +00:00
Baligh Uddin
2d6832d8ff am 3b793b9b: (-s ours) am d541cacf: (-s ours) am be25b245: (-s ours) Import translations. DO NOT MERGE
* commit '3b793b9b5294f606cfb3533c0734026ee9e4890a':
  Import translations. DO NOT MERGE
2014-10-19 22:37:16 +00:00
Baligh Uddin
d25f8443eb am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '6a8871058f857d12390a8887faac4fd2b08bd34c':
  Import translations. DO NOT MERGE
2014-10-19 22:29:21 +00:00
Baligh Uddin
93d67f65ac am 6949eb15: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '6949eb15668dd099958fe7e00afcba448bb09aa1':
  Import translations. DO NOT MERGE
2014-10-19 22:29:20 +00:00
Baligh Uddin
ffd0f4d5e7 am 6f1de7e5: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '6f1de7e5f1a1d75f85eb5c08186d4a9707ba16f1':
  Import translations. DO NOT MERGE
2014-10-19 22:29:18 +00:00
Baligh Uddin
3b793b9b52 am d541cacf: (-s ours) am be25b245: (-s ours) Import translations. DO NOT MERGE
* commit 'd541cacff68f5b009a264721e3e2878d70aa65e2':
  Import translations. DO NOT MERGE
2014-10-19 22:29:17 +00:00
Baligh Uddin
6a8871058f am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'c04edfc31c8e1538630fe3bff06928669d1e3869':
  Import translations. DO NOT MERGE
2014-10-19 22:23:50 +00:00
Baligh Uddin
6949eb1566 am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '815b31f9034dfe56b41852edcb87414db1d1d177':
  Import translations. DO NOT MERGE
2014-10-19 22:23:49 +00:00
Baligh Uddin
6f1de7e5f1 am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'cf1c95ec2264a4dd08365ff6cdf97e92976c390c':
  Import translations. DO NOT MERGE
2014-10-19 22:23:48 +00:00
Baligh Uddin
d541cacff6 am be25b245: (-s ours) Import translations. DO NOT MERGE
* commit 'be25b245f6320ed16fc77c5a09e15a7d15511702':
  Import translations. DO NOT MERGE
2014-10-19 22:23:47 +00:00
Baligh Uddin
c04edfc31c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:15:19 +00:00
Baligh Uddin
815b31f903 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:15:03 +00:00