aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with ↵Jean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '99a7231d50daaacbdb35513b327b475d4de44e3f':
| | | | | * \ \ \ am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release ↵Jean-Baptiste Queru2013-03-110-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '9708aa4e5e1d2909119eed2b47f06e932fc512a2':
| | | | | | * | | | am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12bc4c4babd3db352fd58062fcdf6223060a5379':
| | | | | | * | | | Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | | | |\ \ \ \
* | | | | | | | | | | am d7b4af9b: am 67e264de: Merge "Add dotted circle to combination letter" ↵Tadashi G. Takaoka2013-03-1117-110/+679
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'd7b4af9b560fb11ca0acb78ca937a0eeb06e147c': Add dotted circle to combination letter
| * | | | | | | | | | am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-devTadashi G. Takaoka2013-03-1117-110/+679
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67e264de6b2367bc7522b51b1b3f52445e5dde6a': Add dotted circle to combination letter
| | * | | | | | | | | Merge "Add dotted circle to combination letter" into jb-mr2-devTadashi G. Takaoka2013-03-1117-110/+679
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add dotted circle to combination letterTadashi G. Takaoka2013-03-1117-110/+679
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | am 2d9b7f60: am af37cbb4: Merge "Announce keyboard mode changes as a ↵Svetoslav Ganov2013-03-084-6/+124
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WINDOW_STATE_CHANGED event." into jb-mr2-dev * commit '2d9b7f60dd8c8dfdf89fd3a9eb41296a58df3a22': Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
| * | | | | | | | | | | am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED ↵Svetoslav Ganov2013-03-084-6/+124
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event." into jb-mr2-dev * commit 'af37cbb44ef40fcd15fa02456c9abda8021847ce': Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
| | * | | | | | | | | | Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into ↵Svetoslav Ganov2013-03-084-6/+124
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | | * | | | | | | | | Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.Alan Viverette2013-03-074-6/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8165295 Change-Id: Ie416f6cdb68377f3e06f30e9b6363c38ba2a602d
* | | | | | | | | | | | am 60906d4d: am 914d054e: Move logic of selecting key preview attribute to ↵Tadashi G. Takaoka2013-03-082-17/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Key class * commit '60906d4d08fdf4295c97ddfeacd61a06e7bc0f0c': Move logic of selecting key preview attribute to Key class
| * | | | | | | | | | | am 914d054e: Move logic of selecting key preview attribute to Key classTadashi G. Takaoka2013-03-082-17/+36
| |\| | | | | | | | | | | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '914d054ea26d18a1ba6a60f8c5e749136477bbf2': Move logic of selecting key preview attribute to Key class
| | * | | | | | | | | Move logic of selecting key preview attribute to Key classTadashi G. Takaoka2013-03-082-17/+36
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes the size of a key preview letter to follow a keyLabelFlags specification. Change-Id: Ie13790788a16c5a053c1a2cbcac3d38314b14b7f
* | | | | | | | | | am bba39b9b: [FileEncap8] Remove useless "success" variableKurt Partridge2013-03-071-13/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bba39b9b678f4fb00511ba88c12eef9082ecc628': [FileEncap8] Remove useless "success" variable
| * | | | | | | | | [FileEncap8] Remove useless "success" variableKurt Partridge2013-03-071-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf76bc0b795b6a9221d9a6d61c38df31af54ab7b
* | | | | | | | | | am ee3261ff: [FileEncap7] Extract uploadContents methodKurt Partridge2013-03-071-8/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee3261ff558ee734e15af5424f98bb8d8776795f': [FileEncap7] Extract uploadContents method
| * | | | | | | | | [FileEncap7] Extract uploadContents methodKurt Partridge2013-03-071-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I018b2726533042dbcb25713ea039aec41c148db2
* | | | | | | | | | am bca8348e: Merge "[FileEncap6] Extract Uploader class"Kurt Partridge2013-03-072-162/+197
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bca8348e988170506c6c6ffc862f3377cf60dc8e': [FileEncap6] Extract Uploader class
| * | | | | | | | | Merge "[FileEncap6] Extract Uploader class"Kurt Partridge2013-03-082-162/+197
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [FileEncap6] Extract Uploader classKurt Partridge2013-03-072-162/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gerrit was stuck on original change I9ef4eb7450 Change-Id: I6d4ee686944074779aca5b09b018782c7033874d
* | | | | | | | | | | am d1ba22fd: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-03-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1ba22fda844cb5ffe25eeff434bda6a8994641a': Import translations. DO NOT MERGE
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-03-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I363753d020e086f5a60abd84377afff7a4b280ea Auto-generated-cl: translation import
* | | | | | | | | | | am 1006728c: (-s ours) am eb26838a: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-03-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into jb-mr2-dev * commit '1006728c9c142eba756383cc5f99cb5a5d3d4bd2': Import translations. DO NOT MERGE
| * | | | | | | | | | am eb26838a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-03-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb26838afad3c384da53dd2150d81c3b22403433': Import translations. DO NOT MERGE
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-03-071-2/+2
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-061-2/+2
| | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7cc086bac4494d1238ef6c5f9939a651100ee42d Auto-generated-cl: translation import
* | | | | | | | | | | am d48c2117: am f4425aaa: Refactor ProximityType and CorrectionTypeSatoshi Kataoka2013-03-074-28/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd48c2117d0753ee21e9f6a14702dc8ec2fc4c408': Refactor ProximityType and CorrectionType
| * | | | | | | | | | am f4425aaa: Refactor ProximityType and CorrectionTypeSatoshi Kataoka2013-03-074-28/+29
| |\| | | | | | | | | | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4425aaae971fe78d44530ebe01cf7a59b2e47aa': Refactor ProximityType and CorrectionType
| | * | | | | | | | Refactor ProximityType and CorrectionTypeSatoshi Kataoka2013-03-074-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8277656 Change-Id: Ia7940bbf81fcf4ff5eb7869b105d98aa34155d33
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-03-071-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I715549b3e9bad6dd856883af8b6e828798921e38 Auto-generated-cl: translation import
* | | | | | | | | | | am 951272d2: am 2192d08b: Remove unused scale parameter from ↵Tom Ouyang2013-03-064-30/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getPointToKeyLength() * commit '951272d24aa2ec188c1cdcfdbd1a2afc8edf2d3f': Remove unused scale parameter from getPointToKeyLength()
| * | | | | | | | | | am 2192d08b: Remove unused scale parameter from getPointToKeyLength()Tom Ouyang2013-03-074-30/+7
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2192d08b9cca6a40d834d6a5001d19b5845ed8a0': Remove unused scale parameter from getPointToKeyLength()
| | * | | | | | | | | Remove unused scale parameter from getPointToKeyLength()Tom Ouyang2013-03-064-30/+7
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7bbe1b68264a389923f8a19bb37646c8ab0cb46f
* | | | | | | | | | am 41c471d9: Merge "[FileEncap5] Move conditional logic to caller"Kurt Partridge2013-03-061-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '41c471d93d117a65a4f241e588154d84709cf5d0': [FileEncap5] Move conditional logic to caller
| * | | | | | | | | Merge "[FileEncap5] Move conditional logic to caller"Kurt Partridge2013-03-061-3/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [FileEncap5] Move conditional logic to callerKurt Partridge2013-03-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6599539059f86dc8902210d325439c08035b2e2a
* | | | | | | | | | | am 1bc20700: Merge "[FileEncap4] Simplify logic"Kurt Partridge2013-03-061-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bc20700d594af28bb87575df4279b0bed624c52': [FileEncap4] Simplify logic
| * | | | | | | | | | Merge "[FileEncap4] Simplify logic"Kurt Partridge2013-03-061-4/+5
| |\| | | | | | | | |
| | * | | | | | | | | [FileEncap4] Simplify logicKurt Partridge2013-03-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb8660d12812b867856259d3e5c04a31e281027d
* | | | | | | | | | | am 719bb3aa: Merge "[FileEncap3] Extract isUploadingUnconditionally method"Kurt Partridge2013-03-061-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '719bb3aa39c6456b7d672258432d18ad917ba263': [FileEncap3] Extract isUploadingUnconditionally method
| * | | | | | | | | | Merge "[FileEncap3] Extract isUploadingUnconditionally method"Kurt Partridge2013-03-061-5/+8
| |\| | | | | | | | |
| | * | | | | | | | | [FileEncap3] Extract isUploadingUnconditionally methodKurt Partridge2013-03-061-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove isUploadingUnconditionally local variable Change-Id: I69be8708c1f306568cbb9c5cbefc9e42a87df497
* | | | | | | | | | | am 5e5b6b78: Merge "[FileEncap2] Remove mCanUpload instance variable"Kurt Partridge2013-03-061-6/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e5b6b78709b055ac5ed71153c0a696c63201a38': [FileEncap2] Remove mCanUpload instance variable
| * | | | | | | | | | Merge "[FileEncap2] Remove mCanUpload instance variable"Kurt Partridge2013-03-061-6/+5
| |\| | | | | | | | |
| | * | | | | | | | | [FileEncap2] Remove mCanUpload instance variableKurt Partridge2013-03-061-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I62a100c4d73bb64a14a7994f7dd9af7b6946d064
* | | | | | | | | | | am b000e94e: Merge "[FileEncap1] Extract hasUploadingPermisssions method"Kurt Partridge2013-03-061-4/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b000e94eea988e58fe5de7cb1a2f8fc03acfd4b3': [FileEncap1] Extract hasUploadingPermisssions method