aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | am 0ae5b07b: Yet another cleanup in ProximityInfoParamsKen Wakasa2013-02-014-17/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Ken Wakasa * commit '0ae5b07b3bab96fcd832ea17644d5c5f2c5ba678': Yet another cleanup in ProximityInfoParams
| * | | | | | | Yet another cleanup in ProximityInfoParamsKen Wakasa2013-02-014-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice5f5e519f4ccd2e6035010b8fe6b2296ef658d7
* | | | | | | | am de1ec79a: Merge "Cleanup in ProximityInfoStateUtils"Ken Wakasa2013-01-315-163/+224
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Ken Wakasa (1) * commit 'de1ec79a357505251c5dad91ebd34ffbcbc03c08': Cleanup in ProximityInfoStateUtils
| * | | | | | | Merge "Cleanup in ProximityInfoStateUtils"Ken Wakasa2013-02-015-163/+224
| |\ \ \ \ \ \ \
| | * | | | | | | Cleanup in ProximityInfoStateUtilsKen Wakasa2013-02-015-163/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I416c0f0a5da6ce69c4ca1e848168e47b83d6597a
* | | | | | | | | am 5c58133c: Clean up GestureFloatingPreviewTextTadashi G. Takaoka2013-01-311-45/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Tadashi G. Takaoka * commit '5c58133c8098c73b687ac8483ed8b2c32a53c257': Clean up GestureFloatingPreviewText
| * | | | | | | | Clean up GestureFloatingPreviewTextTadashi G. Takaoka2013-02-011-45/+31
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie64dd06a99e54b2f432725f69dc4f38c81359ce6
* | | | | | | | am 40be4c3b: ResearchLogger invocation testsKurt Partridge2013-01-311-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Kurt Partridge * commit '40be4c3bdbca143034f1308848add258e9856ad5': ResearchLogger invocation tests
| * | | | | | | ResearchLogger invocation testsKurt Partridge2013-01-311-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Start with just a smoke test. - Sets up a private SharedPreferences multi-project commit with I81cceba23692d64c2ea58a46351fc36d118ff825 Change-Id: I96e02d9a8de70cb5c03fd7411b886903e7a83673
* | | | | | | am 6b574f80: Merge "[Rlog39] Remove unnecessary commitCurrentLogUnit() call"Kurt Partridge2013-01-311-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '6b574f80567aa74e2b033ce1f71fa52f6cfe48f2': [Rlog39] Remove unnecessary commitCurrentLogUnit() call
| * | | | | | Merge "[Rlog39] Remove unnecessary commitCurrentLogUnit() call"Kurt Partridge2013-01-311-1/+0
| |\ \ \ \ \ \
| | * | | | | | [Rlog39] Remove unnecessary commitCurrentLogUnit() callKurt Partridge2013-01-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1983095058d004476065328ad34bb9e325af7062
* | | | | | | | am 5ea4365f: Merge "Create methods in LatinIME to make the current dict lists"Jean Chalard2013-01-315-14/+118
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Jean Chalard (1) * commit '5ea4365f077f59341430e00ed34a5d74b7877931': Create methods in LatinIME to make the current dict lists
| * | | | | | | Merge "Create methods in LatinIME to make the current dict lists"Jean Chalard2013-01-315-14/+118
| |\ \ \ \ \ \ \
| | * | | | | | | Create methods in LatinIME to make the current dict listsJean Chalard2013-01-315-14/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7005813 Change-Id: I82232af8e3071333b6fd01e4453b6b3c0a3ddb1f
* | | | | | | | | am 4920d370: Cleanup in ProximityInfoStateUtilsKen Wakasa2013-01-315-56/+71
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Ken Wakasa * commit '4920d370f2a9f14bcc14212738590c22bd3752d0': Cleanup in ProximityInfoStateUtils
| * | | | | | | | Cleanup in ProximityInfoStateUtilsKen Wakasa2013-01-315-56/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifce1c4a2c8b8859c1723ebe01023211a9f495b2f
* | | | | | | | | am 4fab43dd: Merge "remove unused function"Satoshi Kataoka2013-01-312-7/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Satoshi Kataoka (1) * commit '4fab43dd1453211f97d62a3000b3f2a2740e9bfa': remove unused function
| * | | | | | | | Merge "remove unused function"Satoshi Kataoka2013-01-312-7/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | remove unused functionSatoshi Kataoka2013-01-312-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7dbcf2926801279a286980f6a650f63722890cea
* | | | | | | | | | am 871b8c93: Cleanups in defines.hKen Wakasa2013-01-311-25/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Ken Wakasa * commit '871b8c9352a628f5166d64d37b5877d49a6a191e': Cleanups in defines.h
| * | | | | | | | | Cleanups in defines.hKen Wakasa2013-01-311-25/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75ab11e0d6374a2d1302d1684453a61b98682b13
* | | | | | | | | am a8ce88bf: Remove meaningless assertionKen Wakasa2013-01-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Ken Wakasa * commit 'a8ce88bf447c7de1ec7c35130d7cec8be63633cf': Remove meaningless assertion
| * | | | | | | | Remove meaningless assertionKen Wakasa2013-01-311-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I8c12a11e54e084cc0554c54cecb441e96a03df08
* | | | | | | | am 3c67f6a2: Merge "Add a way to know externally if we\'re installing a new ↵Jean Chalard2013-01-302-2/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dict" # Via Android (Google) Code Review (1) and Jean Chalard (1) * commit '3c67f6a2d020a6e1d85abc32e1d1477439f917f4': Add a way to know externally if we're installing a new dict
| * | | | | | | Merge "Add a way to know externally if we're installing a new dict"Jean Chalard2013-01-312-2/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Add a way to know externally if we're installing a new dictJean Chalard2013-01-312-2/+11
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That helps tests know when to wait and when to declare the dictionary actually not usable. Bug: 7925814 Change-Id: Ic963c1206c43e3cde39ac4214a0d601f4fc6c03b
* | | | | | | | am 559d1f0c: Merge "Small cleanups in binary_format.h"Ken Wakasa2013-01-301-8/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Ken Wakasa (1) * commit '559d1f0ced51195f1a5b06b765edfdf2c1d2356b': Small cleanups in binary_format.h
| * | | | | | | Merge "Small cleanups in binary_format.h"Ken Wakasa2013-01-301-8/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Small cleanups in binary_format.hKen Wakasa2013-01-301-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6049a2f312b7d53a3ffa688ddca5731004784ebe
* | | | | | | | | am ee800cf5: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-01-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit 'ee800cf5ba4fb07829ecd6e3199b1b419f8f2337': Import translations. DO NOT MERGE
| * | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-01-3053-295/+459
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-01-3053-295/+459
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7abda81fe11b1faa8a82ed42609c5dfa7a62a318 Auto-generated-cl: translation import
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-01-3053-138/+216
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-01-3053-138/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2e0cee92c82d2b1f9c225ce321c32a51953968c Auto-generated-cl: translation import
* | | | | | | | | | | am 8e5718cc: Merge "Build native subdirectories first"Kurt Partridge2013-01-301-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '8e5718cca8d1c326ec39f045557cd70707f14965': Build native subdirectories first
| * | | | | | | | | | Merge "Build native subdirectories first"Kurt Partridge2013-01-301-2/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Build native subdirectories firstKurt Partridge2013-01-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-project commit with I004026c5c0400929ec56f5f7ab8fbe3b00eed75a Change-Id: Ic66148abfc12fca3532806c5fb2166efc072a60b
* | | | | | | | | | | | am 9c18a471: Merge "[Rlog29] User interface for recording"Kurt Partridge2013-01-306-179/+364
|\| | | | | | | | | | | | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '9c18a47162cb88242632e3a37bfae99d21d8f85a': [Rlog29] User interface for recording
| * | | | | | | | | | Merge "[Rlog29] User interface for recording"Kurt Partridge2013-01-306-179/+364
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | [Rlog29] User interface for recordingKurt Partridge2013-01-296-179/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also, internal flag for automatically replaying after a recording is made (off by default) - RLog key to "Bug?" multi-project commit with I0c2fababd73eed5a341af487bca04ddd650d4cc2 Change-Id: I162c96a715de7180f276e08b4686a20f29dabafb
* | | | | | | | | | | am 4e049897: Merge "[Rlog27] Add replay capability"Kurt Partridge2013-01-307-87/+580
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '4e049897eff1c170ea65492ed6df46395fc33e86': [Rlog27] Add replay capability
| * | | | | | | | | | Merge "[Rlog27] Add replay capability"Kurt Partridge2013-01-307-87/+580
| |\| | | | | | | | | | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | [Rlog27] Add replay capabilityKurt Partridge2013-01-297-87/+580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add support for replaying log files to the ResearchLogger. This will let users preview data that they choose to upload. - When the user explicitly requests that the system record their action, it will record everything up to, and including, the motion involved in shutting off the recording. This change also removes the stop-recording motion commands. Change-Id: Ib1df383bbf1881512cb111fab9f6749c25e436ba
* | | | | | | | | | am 99eae8e9: refactorSatoshi Kataoka2013-01-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Satoshi Kataoka * commit '99eae8e984ad0e6d6c5b0f66b562a839e8d2bf7d': refactor
| * | | | | | | | | refactorSatoshi Kataoka2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5a59667cf3b9dc0c4d7423d2cf4ab640bdacf49
* | | | | | | | | | am 6e2ba9b0: Remove unnecessary maxProximityCharsSizeKen Wakasa2013-01-303-27/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Ken Wakasa * commit '6e2ba9b01e61d214e8d6fad8d7093a80a97dd243': Remove unnecessary maxProximityCharsSize
| * | | | | | | | | Remove unnecessary maxProximityCharsSizeKen Wakasa2013-01-303-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8013004c1db2a4133795a0e41edea1a41b770cfd
* | | | | | | | | | am a47c699f: Just cosmetic fixesKen Wakasa2013-01-302-53/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Ken Wakasa * commit 'a47c699faadfe9ab677f52c29a7c61fd7ff9b492': Just cosmetic fixes
| * | | | | | | | | Just cosmetic fixesKen Wakasa2013-01-302-53/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85e9454d774162df46a29791eb562d0cedaff78e