aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | [TestPrep4] Add some finalsKurt Partridge2013-02-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib437a6ad7fd6a897e2bbc65afe881ae8a3b1cbb0
* | | | | | | | | | am 7c996475: Merge "[TestPrep3] Add helper method to retrive dictionary"Kurt Partridge2013-02-211-7/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c996475d8531af413c09d4ece51423b96edd172': [TestPrep3] Add helper method to retrive dictionary
| * | | | | | | | | Merge "[TestPrep3] Add helper method to retrive dictionary"Kurt Partridge2013-02-211-7/+9
| |\| | | | | | | |
| | * | | | | | | | [TestPrep3] Add helper method to retrive dictionaryKurt Partridge2013-02-201-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id6e03c6f8a3e96979d589f0605ac056fcad7e1ff
* | | | | | | | | | am c8a1ec6e: Merge "[TestPrep2] Rename a method"Kurt Partridge2013-02-212-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8a1ec6e4128240a8f666120dbc3fb066a717f00': [TestPrep2] Rename a method
| * | | | | | | | | Merge "[TestPrep2] Rename a method"Kurt Partridge2013-02-212-4/+4
| |\| | | | | | | |
| | * | | | | | | | [TestPrep2] Rename a methodKurt Partridge2013-02-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9a72045afa3558b20b9d63c8720fb7443d34fd9
* | | | | | | | | | am 4e5a4ddb: Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"Kurt Partridge2013-02-212-11/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e5a4ddbd06c3e98e931a789c13a9920fb3b4e16': [TestPrep1] Move MotionEvent.Action strings to LoggingUtils
| * | | | | | | | | Merge "[TestPrep1] Move MotionEvent.Action strings to LoggingUtils"Kurt Partridge2013-02-212-11/+39
| |\| | | | | | | |
| | * | | | | | | | [TestPrep1] Move MotionEvent.Action strings to LoggingUtilsKurt Partridge2013-02-202-11/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b9ed800552f2fd546ed21e9dc06ea1ff5798337
* | | | | | | | | | am 2b47513d: Merge "add defines"Satoshi Kataoka2013-02-211-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b47513de13ef0bb2a994b9506ce6e388eb7b68c': add defines
| * | | | | | | | | Merge "add defines"Satoshi Kataoka2013-02-211-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | add definesSatoshi Kataoka2013-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bc009bf258cbdf01e15dc63a7a8afad47db5d96
* | | | | | | | | | | am 07296cf7: Merge "Use WordComposer.addKeyInfo for testing"Tadashi G. Takaoka2013-02-211-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07296cf7fffad7282aee24d9313636cf64ffb178': Use WordComposer.addKeyInfo for testing
| * | | | | | | | | | Merge "Use WordComposer.addKeyInfo for testing"Tadashi G. Takaoka2013-02-211-1/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Use WordComposer.addKeyInfo for testingTadashi G. Takaoka2013-02-201-1/+3
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I500654e7a26717aa5547942357e56060afb72969
* | | | | | | | | | | am 46878544: Add preliminary setup wizardTadashi G. Takaoka2013-02-2115-5/+745
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46878544ec894fd3db368e183404a01c3e3ecc92': Add preliminary setup wizard
| * | | | | | | | | | Add preliminary setup wizardTadashi G. Takaoka2013-02-2115-5/+745
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I30d9cd637fb1d2e64588550e0aa4387bc1f7e6e5
* | | | | | | | | | am 77391900: Merge remote-tracking branch \'goog/jb-mr2-release\'Ed Heyl2013-02-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7739190083f80152a9aa55eb8c76ed156fc277e3': Don't try to issue delete() commands on missing provider
| * | | | | | | | | Merge remote-tracking branch 'goog/jb-mr2-release'Ed Heyl2013-02-200-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-200-0/+0
| |/| | | | | | | | |
| | * | | | | | | | | merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-190-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-140-0/+0
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-130-0/+0
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-120-0/+0
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Don't try to issue delete() commands on missing providerJean Chalard2013-02-111-21/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8173622 Change-Id: Id3dc510ae3535169b5290e87075cb2f433a1f603
* | | | | | | | | | | | | | am c3c9539c: Merge "Add debug output"Satoshi Kataoka2013-02-191-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3c9539c7d0cd8d5fc6edaa257d8038d875c8c26': Add debug output
| * | | | | | | | | | | | | Merge "Add debug output"Satoshi Kataoka2013-02-201-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add debug outputSatoshi Kataoka2013-02-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45fd249a6536e438125782e6e7800760f8e8d426
* | | | | | | | | | | | | | am da348e11: Fix layout direction of Keyboard and Suggestions viewTadashi G. Takaoka2013-02-181-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da348e11ad43b5eaf70a6bad8551a86cd43a6512': Fix layout direction of Keyboard and Suggestions view
| * | | | | | | | | | | | | Fix layout direction of Keyboard and Suggestions viewTadashi G. Takaoka2013-02-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8167348 Change-Id: I5e0432707fff1dd3032686b733ba28bef305173a
* | | | | | | | | | | | | | am d4cbc4fd: Implement getting data files with protocol v2Jean Chalard2013-02-151-26/+55
|\| | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4cbc4fd078cbb23be4eafe1cb82a8a470fca3a0': Implement getting data files with protocol v2
| * | | | | | | | | | | | Implement getting data files with protocol v2Jean Chalard2013-02-151-26/+55
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also does it for deleting them Bug: 8167342 Bug: 6789534 Change-Id: I1823f98508881f109a667146d3608003f87aa4cb
* | | | | | | | | | | | am 4beaab2a: Merge "Determine the protocol version of the dictionary pack"Jean Chalard2013-02-141-14/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Jean Chalard (1) * commit '4beaab2a88ce616bdc8ca35248d65c1b649943a9': Determine the protocol version of the dictionary pack
| * | | | | | | | | | | Merge "Determine the protocol version of the dictionary pack"Jean Chalard2013-02-141-14/+44
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Determine the protocol version of the dictionary packJean Chalard2013-02-131-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...for query. Bug: 8167342 Change-Id: Ieb8e5b31c4b62bf507593c4631e31799aad5f267
* | | | | | | | | | | | am 4c53e144: Merge "Add placeholder of keyboard setup wizard"Tadashi G. Takaoka2013-02-142-5/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1) * commit '4c53e144c184a7b084e9deecf5d1f1fe01ec1af9': Add placeholder of keyboard setup wizard
| * | | | | | | | | | | Merge "Add placeholder of keyboard setup wizard"Tadashi G. Takaoka2013-02-142-5/+52
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add placeholder of keyboard setup wizardTadashi G. Takaoka2013-02-142-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I5552e9d0ffa8f94d183e76378d55bba6f718adfe
* | | | | | | | | | | | am f9097056: Merge "clean up seach key vector"Satoshi Kataoka2013-02-146-62/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Satoshi Kataoka (1) * commit 'f9097056f2ee5fd9044443963568c15649c7da37': clean up seach key vector
| * | | | | | | | | | | Merge "clean up seach key vector"Satoshi Kataoka2013-02-146-62/+57
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | clean up seach key vectorSatoshi Kataoka2013-02-146-62/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8197301 Change-Id: I6a67d2914bd44b3ceca655adcd65c9c42796b026
* | | | | | | | | | | | am 2834f522: Merge "Prep for GCC 4.6 that will be used in unbundled branches"Ken Wakasa2013-02-132-6/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Ken Wakasa (1) * commit '2834f522b78d57ee862c5444e389a3834ba6de63': Prep for GCC 4.6 that will be used in unbundled branches
| * | | | | | | | | | | Merge "Prep for GCC 4.6 that will be used in unbundled branches"Ken Wakasa2013-02-142-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Prep for GCC 4.6 that will be used in unbundled branchesKen Wakasa2013-02-132-6/+7
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31c1d1bc573ee10779efce0f221d378ad758e9ca
* | | | | | | | | | | am de3e5fbf: Merge "Cleanup in preparation for tests"Kurt Partridge2013-02-133-9/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit 'de3e5fbf9dfb2e4e34095e0c34e8aec8d8de02f5': Cleanup in preparation for tests
| * | | | | | | | | | Merge "Cleanup in preparation for tests"Kurt Partridge2013-02-133-9/+16
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Cleanup in preparation for testsKurt Partridge2013-02-123-9/+16
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-project commit with I1212da392ecda0ad78962da68941870b5a651eee Change-Id: Ie74af59d4e45bf954723fee9dcf350a36468c381
* | | | | | | | | | | am d1f80f72: Merge "Clean up dictionary pack presence test."Jean Chalard2013-02-131-39/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Jean Chalard (1) * commit 'd1f80f72e33f79ae8ed94a279a9969cc238a83a7': Clean up dictionary pack presence test.
| * | | | | | | | | | Merge "Clean up dictionary pack presence test."Jean Chalard2013-02-131-39/+21
| |\ \ \ \ \ \ \ \ \ \