Jean-Baptiste Queru
2d83a03ba3
am fd40dd97: (-s ours) am 998a1748: (-s ours) am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'fd40dd977d785aafbe781c918dc94dedbc59eacd':
2013-03-11 13:58:32 -07:00
Jean-Baptiste Queru
fd40dd977d
am 998a1748: (-s ours) am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '998a1748b68838ee2b1465c9e53de65453b0a047':
2013-03-11 20:56:09 +00:00
Jean-Baptiste Queru
998a1748b6
am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'c3f789fd917ba413be8b6f73f87e49a8773bea41':
2013-03-11 13:44:28 -07:00
Jean-Baptiste Queru
c3f789fd91
am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '7b52eac491e6a97c6ef87cbcb08e5f902c10c9e3':
2013-03-11 13:13:33 -07:00
Jean-Baptiste Queru
7b52eac491
am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '99a7231d50daaacbdb35513b327b475d4de44e3f':
2013-03-11 13:00:40 -07:00
Jean-Baptiste Queru
99a7231d50
am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '9708aa4e5e1d2909119eed2b47f06e932fc512a2':
2013-03-11 12:47:18 -07:00
Jean-Baptiste Queru
9708aa4e5e
am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '12bc4c4babd3db352fd58062fcdf6223060a5379':
2013-03-11 12:28:05 -07:00
Jean-Baptiste Queru
12bc4c4bab
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:22:23 -07:00
Tadashi G. Takaoka
4660cf5c5b
am d7b4af9b: am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev
...
* commit 'd7b4af9b560fb11ca0acb78ca937a0eeb06e147c':
Add dotted circle to combination letter
2013-03-11 02:07:10 -07:00
Tadashi G. Takaoka
d7b4af9b56
am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev
...
* commit '67e264de6b2367bc7522b51b1b3f52445e5dde6a':
Add dotted circle to combination letter
2013-03-11 09:05:17 +00:00
Tadashi G. Takaoka
67e264de6b
Merge "Add dotted circle to combination letter" into jb-mr2-dev
2013-03-11 09:01:19 +00:00
Tadashi G. Takaoka
0b928509c7
Add dotted circle to combination letter
...
This dotted circle (U+25CC) hack is needed to the device that runs API
version 14 and 15. The device that runs API version 16 and 17 has an
issue to draw incomplete successive combining code points of Hindi.
The device that runs API version greater than 17 has no issue to draw
incomplete Hindi combining letters.
Bug: 6233945
Bug: 8344448
Change-Id: I22361da908ccca3ebad0beb32e7f69219e9160d6
2013-03-11 17:23:56 +09:00
Svetoslav Ganov
9f555dcd5c
am 2d9b7f60: am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev
...
* commit '2d9b7f60dd8c8dfdf89fd3a9eb41296a58df3a22':
Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
2013-03-08 11:26:15 -08:00
Svetoslav Ganov
2d9b7f60dd
am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev
...
* commit 'af37cbb44ef40fcd15fa02456c9abda8021847ce':
Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
2013-03-08 19:24:25 +00:00
Svetoslav Ganov
af37cbb44e
Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev
2013-03-08 19:20:00 +00:00
Tadashi G. Takaoka
e6db1b9bfd
am 60906d4d: am 914d054e: Move logic of selecting key preview attribute to Key class
...
* commit '60906d4d08fdf4295c97ddfeacd61a06e7bc0f0c':
Move logic of selecting key preview attribute to Key class
2013-03-08 03:25:24 -08:00
Tadashi G. Takaoka
60906d4d08
am 914d054e: Move logic of selecting key preview attribute to Key class
...
* commit '914d054ea26d18a1ba6a60f8c5e749136477bbf2':
Move logic of selecting key preview attribute to Key class
2013-03-08 11:24:13 +00:00
Tadashi G. Takaoka
914d054ea2
Move logic of selecting key preview attribute to Key class
...
This change also fixes the size of a key preview letter to follow a
keyLabelFlags specification.
Change-Id: Ie13790788a16c5a053c1a2cbcac3d38314b14b7f
2013-03-08 19:44:22 +09:00
Kurt Partridge
a515f3ef39
am bba39b9b: [FileEncap8] Remove useless "success" variable
...
* commit 'bba39b9b678f4fb00511ba88c12eef9082ecc628':
[FileEncap8] Remove useless "success" variable
2013-03-07 19:57:34 -08:00
Kurt Partridge
d9fe8049d4
am ee3261ff: [FileEncap7] Extract uploadContents method
...
* commit 'ee3261ff558ee734e15af5424f98bb8d8776795f':
[FileEncap7] Extract uploadContents method
2013-03-07 19:13:56 -08:00
Kurt Partridge
bba39b9b67
[FileEncap8] Remove useless "success" variable
...
Change-Id: Icf76bc0b795b6a9221d9a6d61c38df31af54ab7b
2013-03-07 17:43:35 -08:00
Kurt Partridge
ee3261ff55
[FileEncap7] Extract uploadContents method
...
Change-Id: I018b2726533042dbcb25713ea039aec41c148db2
2013-03-07 17:43:28 -08:00
Kurt Partridge
0079d3abf4
am bca8348e: Merge "[FileEncap6] Extract Uploader class"
...
* commit 'bca8348e988170506c6c6ffc862f3377cf60dc8e':
[FileEncap6] Extract Uploader class
2013-03-07 16:38:48 -08:00
Kurt Partridge
bca8348e98
Merge "[FileEncap6] Extract Uploader class"
2013-03-08 00:37:14 +00:00
Baligh Uddin
e2d4fcd017
am d1ba22fd: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'd1ba22fda844cb5ffe25eeff434bda6a8994641a':
Import translations. DO NOT MERGE
2013-03-07 16:22:40 -08:00
Baligh Uddin
d1ba22fda8
Merge "Import translations. DO NOT MERGE"
2013-03-08 00:21:08 +00:00
Kurt Partridge
4436446e9b
[FileEncap6] Extract Uploader class
...
Gerrit was stuck on original change I9ef4eb7450
Change-Id: I6d4ee686944074779aca5b09b018782c7033874d
2013-03-07 16:19:44 -08:00
Alan Viverette
c2ee72a214
Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
...
Bug: 8165295
Change-Id: Ie416f6cdb68377f3e06f30e9b6363c38ba2a602d
2013-03-07 10:39:55 -08:00
Baligh Uddin
2a396adc73
am 1006728c: (-s ours) am eb26838a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '1006728c9c142eba756383cc5f99cb5a5d3d4bd2':
Import translations. DO NOT MERGE
2013-03-07 09:36:37 -08:00
Satoshi Kataoka
505c418dbf
am d48c2117: am f4425aaa: Refactor ProximityType and CorrectionType
...
* commit 'd48c2117d0753ee21e9f6a14702dc8ec2fc4c408':
Refactor ProximityType and CorrectionType
2013-03-07 09:36:36 -08:00
Baligh Uddin
1006728c9c
am eb26838a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'eb26838afad3c384da53dd2150d81c3b22403433':
Import translations. DO NOT MERGE
2013-03-07 17:34:30 +00:00
Satoshi Kataoka
d48c2117d0
am f4425aaa: Refactor ProximityType and CorrectionType
...
* commit 'f4425aaae971fe78d44530ebe01cf7a59b2e47aa':
Refactor ProximityType and CorrectionType
2013-03-07 17:34:29 +00:00
Baligh Uddin
adfa9b9a94
Import translations. DO NOT MERGE
...
Change-Id: I363753d020e086f5a60abd84377afff7a4b280ea
Auto-generated-cl: translation import
2013-03-07 15:05:01 +00:00
Baligh Uddin
8a60ae01d3
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-03-07 05:27:29 +00:00
Baligh Uddin
eb26838afa
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-07 05:26:16 +00:00
Satoshi Kataoka
f4425aaae9
Refactor ProximityType and CorrectionType
...
Bug: 8277656
Change-Id: Ia7940bbf81fcf4ff5eb7869b105d98aa34155d33
2013-03-07 13:23:02 +09:00
Tom Ouyang
6f1388571f
am 951272d2: am 2192d08b: Remove unused scale parameter from getPointToKeyLength()
...
* commit '951272d24aa2ec188c1cdcfdbd1a2afc8edf2d3f':
Remove unused scale parameter from getPointToKeyLength()
2013-03-06 18:46:45 -08:00
Tom Ouyang
951272d24a
am 2192d08b: Remove unused scale parameter from getPointToKeyLength()
...
* commit '2192d08b9cca6a40d834d6a5001d19b5845ed8a0':
Remove unused scale parameter from getPointToKeyLength()
2013-03-07 02:45:12 +00:00
Tom Ouyang
2192d08b9c
Remove unused scale parameter from getPointToKeyLength()
...
Change-Id: I7bbe1b68264a389923f8a19bb37646c8ab0cb46f
2013-03-06 18:30:43 -08:00
Kurt Partridge
26df5201cc
am 41c471d9: Merge "[FileEncap5] Move conditional logic to caller"
...
* commit '41c471d93d117a65a4f241e588154d84709cf5d0':
[FileEncap5] Move conditional logic to caller
2013-03-06 13:00:05 -08:00
Kurt Partridge
41c471d93d
Merge "[FileEncap5] Move conditional logic to caller"
2013-03-06 20:59:04 +00:00
Baligh Uddin
bc53c95720
Import translations. DO NOT MERGE
...
Change-Id: I715549b3e9bad6dd856883af8b6e828798921e38
Auto-generated-cl: translation import
2013-03-06 12:44:50 -08:00
Baligh Uddin
73dad2ad41
Import translations. DO NOT MERGE
...
Change-Id: I7cc086bac4494d1238ef6c5f9939a651100ee42d
Auto-generated-cl: translation import
2013-03-06 12:43:53 -08:00
Kurt Partridge
be4e180fab
am 1bc20700: Merge "[FileEncap4] Simplify logic"
...
* commit '1bc20700d594af28bb87575df4279b0bed624c52':
[FileEncap4] Simplify logic
2013-03-06 12:06:44 -08:00
Kurt Partridge
1bc20700d5
Merge "[FileEncap4] Simplify logic"
2013-03-06 20:05:47 +00:00
Kurt Partridge
0d4c792316
am 719bb3aa: Merge "[FileEncap3] Extract isUploadingUnconditionally method"
...
* commit '719bb3aa39c6456b7d672258432d18ad917ba263':
[FileEncap3] Extract isUploadingUnconditionally method
2013-03-06 11:16:00 -08:00
Kurt Partridge
719bb3aa39
Merge "[FileEncap3] Extract isUploadingUnconditionally method"
2013-03-06 19:14:52 +00:00
Kurt Partridge
dd5055862f
am 5e5b6b78: Merge "[FileEncap2] Remove mCanUpload instance variable"
...
* commit '5e5b6b78709b055ac5ed71153c0a696c63201a38':
[FileEncap2] Remove mCanUpload instance variable
2013-03-06 10:41:16 -08:00
Kurt Partridge
5e5b6b7870
Merge "[FileEncap2] Remove mCanUpload instance variable"
2013-03-06 18:39:07 +00:00
Kurt Partridge
a537cbf132
am b000e94e: Merge "[FileEncap1] Extract hasUploadingPermisssions method"
...
* commit 'b000e94eea988e58fe5de7cb1a2f8fc03acfd4b3':
[FileEncap1] Extract hasUploadingPermisssions method
2013-03-06 10:05:01 -08:00