aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | am 0b6b6ee5: Merge "Notify the dictionary pack about copy failures" into jb-devJean Chalard2012-05-231-5/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b6b6ee542c0e143868538acdf5b161013c0b1de': Notify the dictionary pack about copy failures
| | * | | | | Merge "Notify the dictionary pack about copy failures" into jb-devJean Chalard2012-05-231-5/+13
| | |\ \ \ \ \
| | | * | | | | Notify the dictionary pack about copy failuresJean Chalard2012-05-231-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6532896 Change-Id: I57f7b1a400222c89776f9bff652a7da4470232c5
* | | | | | | | am 09abb2c7: am 2866da88: Make ProximityInfo copy constructor for testTadashi G. Takaoka2012-05-232-9/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09abb2c7de0828c0ec8ee58a442722fbfdf628f5': Make ProximityInfo copy constructor for test
| * | | | | | | am 2866da88: Make ProximityInfo copy constructor for testTadashi G. Takaoka2012-05-232-9/+41
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2866da88a781c501c6f83cfd91eca0d95e25f6e5': Make ProximityInfo copy constructor for test
| | * | | | | | Make ProximityInfo copy constructor for testTadashi G. Takaoka2012-05-232-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I94a29784591208af1849d4941a3b4789b93782de
* | | | | | | | am 0673e941: am 4cba9f58: Merge "Remove unused private method ↵Tadashi G. Takaoka2012-05-231-21/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest.searchBigramSuggestion" into jb-dev * commit '0673e941eb26b491f53bbbb2bbdc49bfd07ff973': Remove unused private method Suggest.searchBigramSuggestion
| * | | | | | | am 4cba9f58: Merge "Remove unused private method ↵Tadashi G. Takaoka2012-05-231-21/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest.searchBigramSuggestion" into jb-dev * commit '4cba9f58d46e390ccdff0450cd4bf7be1d106b5a': Remove unused private method Suggest.searchBigramSuggestion
| | * | | | | | Merge "Remove unused private method Suggest.searchBigramSuggestion" into jb-devTadashi G. Takaoka2012-05-231-21/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Remove unused private method Suggest.searchBigramSuggestionTadashi G. Takaoka2012-05-231-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I077c4c019676fefb8eac6042bd7db1b7ab33ca03
* | | | | | | | am 41531cfb: am ff4c037c: Merge "Remove an updated dictionary that changed ↵Jean Chalard2012-05-232-0/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | locales" into jb-dev * commit '41531cfb7413b22267b17359a76fc47432152d57': Remove an updated dictionary that changed locales
| * | | | | | | am ff4c037c: Merge "Remove an updated dictionary that changed locales" into ↵Jean Chalard2012-05-232-0/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'ff4c037c9dc3533bcaa131fd0405fb8aeea60af4': Remove an updated dictionary that changed locales
| | * | | | | | Merge "Remove an updated dictionary that changed locales" into jb-devJean Chalard2012-05-232-0/+34
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Remove an updated dictionary that changed localesJean Chalard2012-05-232-0/+34
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a dictionary changes locale, we need to remove the file that corresponds to the old version. It has a different path than the new one, so we have to search for it explicitly. Bug: 6540631 Change-Id: Ie9d63ba636651fe90f8fbb9627b7265ac7b34ccd
* | | | | | | am e0e7bba1: am 24ce3645: Merge "Fix RuntiomeException when no custom input ↵Tadashi G. Takaoka2012-05-221-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style is defined" into jb-dev * commit 'e0e7bba154cdc22cf603687eeb8a46e7b57e2eb6': Fix RuntiomeException when no custom input style is defined
| * | | | | | am 24ce3645: Merge "Fix RuntiomeException when no custom input style is ↵Tadashi G. Takaoka2012-05-221-2/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defined" into jb-dev * commit '24ce36458690b34e7315556094b6943003cc490e': Fix RuntiomeException when no custom input style is defined
| | * | | | | Merge "Fix RuntiomeException when no custom input style is defined" into jb-devTadashi G. Takaoka2012-05-221-2/+6
| | |\ \ \ \ \
| | | * | | | | Fix RuntiomeException when no custom input style is definedTadashi G. Takaoka2012-05-231-2/+6
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6524480 Change-Id: I6bceea9fe07095b9ff3ed25c5677a82fa5d4086a
* | | | | | | am c4f66d32: am 6c034901: Fix an NPEJean Chalard2012-05-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4f66d3233159ee224dd0b30dd117fe539af2be6': Fix an NPE
| * | | | | | am 6c034901: Fix an NPEJean Chalard2012-05-221-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c0349012eb0edad56b6b89defebb922bbddbb34': Fix an NPE
| | * | | | | Fix an NPEJean Chalard2012-05-231-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6538761 Change-Id: Id85486ee93437cfec7db421d5c7f2d7980a7e32e
* | | | | | am 04046b77: am 37f81cd6: Merge "Always use AccessibilityUtils to send ↵Svetoslav Ganov2012-05-221-13/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events." into jb-dev * commit '04046b7742f425d6573f54bad9582ad547906852': Always use AccessibilityUtils to send events.
| * | | | | am 37f81cd6: Merge "Always use AccessibilityUtils to send events." into jb-devSvetoslav Ganov2012-05-221-13/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37f81cd6e9a10fbdb3a1a054c88a6b5d98fb0f88': Always use AccessibilityUtils to send events.
| | * | | | Merge "Always use AccessibilityUtils to send events." into jb-devSvetoslav Ganov2012-05-221-13/+1
| | |\ \ \ \
| | | * | | | Always use AccessibilityUtils to send events.alanv2012-05-211-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6532601 Change-Id: I3aba9066ccd8d401973abfe9100f4cab731b5e7d
* | | | | | | am 07163d39: Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07163d3908a6893e544f7909056e738c3180da5f':
| * | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Change-Id: Icde0484962a178e6e29ab17e487b76e9662bb94b
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-210-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | | | |\ \ \
* | | | | \ \ \ Merge "switch ResearchLogger output to json."Kurt Partridge2012-05-223-583/+545
|\ \ \ \ \ \ \ \
| * | | | | | | | switch ResearchLogger output to json.Kurt Partridge2012-05-213-583/+545
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use multiple logging files, clean up internal nested class structure. multi-project commit with I1813b6710ef586d96cf8936662f58b870040d6e5 Bug: 6188932 Change-Id: I438790e28f74747c4c1a48a20c1942a0fd818b6c
* | | | | | | | | am 37105e86: am 09c4909c: Merge "Remove a high surrogate after a delete if ↵Jean Chalard2012-05-221-0/+13
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any" into jb-dev * commit '37105e8636fc84f9e903581443730a0bf6692996': Remove a high surrogate after a delete if any
| * | | | | | | | am 09c4909c: Merge "Remove a high surrogate after a delete if any" into jb-devJean Chalard2012-05-221-0/+13
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '09c4909c7c7ec6eaf3de943547c43a341dc14fe7': Remove a high surrogate after a delete if any
| | * | | | | | | Merge "Remove a high surrogate after a delete if any" into jb-devJean Chalard2012-05-221-0/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove a high surrogate after a delete if anyJean Chalard2012-05-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6526328 Change-Id: Iae70cad7b3c114bc13af48ae0eadd52ab88e8471
* | | | | | | | | | am e0f8476f: am ab619812: Merge "Fix some of the input logic tests" into jb-devJean Chalard2012-05-223-25/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0f8476f71be89e78530f739bee91dd78cdbbc44': Fix some of the input logic tests
| * | | | | | | | | am ab619812: Merge "Fix some of the input logic tests" into jb-devJean Chalard2012-05-223-25/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab619812a52e3d957156e37610392e2b03659891': Fix some of the input logic tests
| | * | | | | | | | Merge "Fix some of the input logic tests" into jb-devJean Chalard2012-05-223-25/+33
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix some of the input logic testsJean Chalard2012-05-223-25/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior has been changed for bug#6105732 Bug: 6516976 Change-Id: Ief8225b26d831cd92a051ce25cc005270b6b1776
* | | | | | | | | | am d818bdc6: am cb53c63e: Merge "Update AOSP dictionaries" into jb-devJean Chalard2012-05-2216-38/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd818bdc6bc5eefc04cb00e9c30ed3b35e7479043': Update AOSP dictionaries
| * | | | | | | | | am cb53c63e: Merge "Update AOSP dictionaries" into jb-devJean Chalard2012-05-2216-38/+69
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb53c63eabf006283ec973f41f3f7d7fc4155f0d': Update AOSP dictionaries
| | * | | | | | | | Merge "Update AOSP dictionaries" into jb-devJean Chalard2012-05-2216-38/+69
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update AOSP dictionariesJean Chalard2012-05-2216-38/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6bb1f9d6df4a9f859f132affc9cb030f14effd9
* | | | | | | | | | | am 6e29b2a9: am 8d9336d0: Merge "Use splitActionBarWhenNarrow for Android ↵Tadashi G. Takaoka2012-05-221-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings activity" into jb-dev * commit '6e29b2a9c84cfef3761f04c497d36cf4e2564b83': Use splitActionBarWhenNarrow for Android Settings activity
| * | | | | | | | | | am 8d9336d0: Merge "Use splitActionBarWhenNarrow for Android Settings ↵Tadashi G. Takaoka2012-05-221-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity" into jb-dev * commit '8d9336d00f79fd4088ed753b2a60bd42a4b1c270': Use splitActionBarWhenNarrow for Android Settings activity
| | * | | | | | | | | Merge "Use splitActionBarWhenNarrow for Android Settings activity" into jb-devTadashi G. Takaoka2012-05-221-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Use splitActionBarWhenNarrow for Android Settings activityTadashi G. Takaoka2012-05-221-1/+2
| | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6503074 Change-Id: I080a6d354888a5d1218be81ffb1f523981b93783
* | | | | | | | | | am 92787ad0: am e1e3ab6f: Merge "Update dictionaries." into jb-devJean Chalard2012-05-215-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92787ad04d1824e79603295a43fc87e1d3e034a7': Update dictionaries.
| * | | | | | | | | am e1e3ab6f: Merge "Update dictionaries." into jb-devJean Chalard2012-05-215-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1e3ab6faec39fb1f503faa2d50c92243b8b41b1': Update dictionaries.