aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Little cleanupsKurt Partridge2013-03-051-7/+4
| | | | Change-Id: I2ded3d0a29610941fac27c9b26168dd6c06ceccc
* Clean up initialization orderingKurt Partridge2013-03-051-29/+24
| | | | | | This change is based on an earlier one that got stuck in Gerrit: Iab77504b Change-Id: I27ad9dfb1bbb2300bd1e61d881a6ea0e116db066
* Clean up logic in onUserLoggingConsentKurt Partridge2013-03-042-17/+17
| | | | | | | | - Make ResearchSetting for whether the user has seen the splash screen - Inline #setLoggingAllowed, which is short and is now only called by onUserLoggingConsent Change-Id: Icdf4592777b80643807b6ccf1d3896459c503e02
* Clean up PREF_USABILITY_STUDY_MODEKurt Partridge2013-03-044-15/+20
| | | | | | | | | | - Refer to a common default value in DebugSettings - Make PREF_USABILITY_STUDY_MODE independent of the ResearchLogger - ResearchLogger uses its own preference through ResearchSettings multi-project commit with Ie0df836c9d779eba484b522666ec357f4e234823 Change-Id: I88547a2f619db6e7364abbbec12f9f76855dd11a
* Merge "Remove MainLogBuffer#setSuggest()"Kurt Partridge2013-03-043-11/+14
|\
| * Remove MainLogBuffer#setSuggest()Kurt Partridge2013-03-013-11/+14
| | | | | | | | | | | | multi-project commit with Ia98b1406fc2ee11a96893c77ea58d800fece7624 Change-Id: I8bc3d07b83dbe7d8fc56a618de07dade7f510b13
* | am a8d3d509: Small cleanup in CompatUtilsKen Wakasa2013-03-041-4/+4
|\ \ | | | | | | | | | | | | * commit 'a8d3d50970cecf961940efc0e908fbb2f9b35472': Small cleanup in CompatUtils
| * | Small cleanup in CompatUtilsKen Wakasa2013-03-021-4/+4
| | | | | | | | | | | | Change-Id: I9b4a8d7eae744ba6252a6475b75240248c70a3c0
| * | Import translations. DO NOT MERGEBaligh Uddin2013-03-0149-1174/+98
| | | | | | | | | | | | | | | Change-Id: I1852e989314ddd2e3f806486a0774ffe446473e8 Auto-generated-cl: translation import
* | | Merge "Move UUID preference reading to ResearchSettings.java"Kurt Partridge2013-03-022-19/+45
|\ \ \
| * | | Move UUID preference reading to ResearchSettings.javaKurt Partridge2013-02-282-19/+45
| | | | | | | | | | | | | | | | Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-0149-586/+14
| |_|/ |/| | | | | | | | | | | Change-Id: Ic31bc6d188785972dd3f11d96ff22592040ceb9f Auto-generated-cl: translation import
* | | am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-devTadashi G. Takaoka2013-03-018-20/+208
|\ \ \ | | |/ | |/| | | | | | | * commit '99b0dc6f0d18f5fdd8634e8fa533bf1b3f81a538': Add setup wizard launcher icon
| * | Merge "Add setup wizard launcher icon" into jb-mr2-devTadashi G. Takaoka2013-03-018-20/+208
| |\ \
| | * | Add setup wizard launcher iconTadashi G. Takaoka2013-03-018-20/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setup wizard icon will be hidden if the Android Keyboard is in system image. Bug: 8239067 Change-Id: Ib0c0c9e3a0954512c3e03e42a661cdf86eff0dca
* | | | Merge "[TestPrep22] Make variable package-private for testing"Kurt Partridge2013-03-011-1/+1
|\ \ \ \
| * | | | [TestPrep22] Make variable package-private for testingKurt Partridge2013-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I902a6a40df1c672c611672f34d2f3237b0d1821b
* | | | | am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string ↵Tadashi G. Takaoka2013-03-011-10/+11
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | resources" into jb-mr2-dev * commit '5c681c17cec355d2cf839e0dfcc38c9bf37f5f0a': Add translatable="false" to setup wizard's string resources
| * | | | Merge "Add translatable="false" to setup wizard's string resources" into ↵Tadashi G. Takaoka2013-03-011-10/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | * | | | Add translatable="false" to setup wizard's string resourcesTadashi G. Takaoka2013-03-011-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8265778 Change-Id: I351dc2b88e4fa33c2008107a1d6d19940c4db6ab
* | | | | | am abaf5827: Separate suggestions from SuggestionViewJean Chalard2013-03-012-20/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351': Separate suggestions from SuggestionView
| * | | | | Separate suggestions from SuggestionViewJean Chalard2013-02-282-20/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cleanup change, but it's also necessary for Bug: 8152758 Change-Id: Id6ba06243f573fdb856f87d1df03277c9f2e5e71
* | | | | Merge "[TestPrep20] Clean up import statement"Kurt Partridge2013-03-011-1/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [TestPrep20] Clean up import statementKurt Partridge2013-02-281-1/+0
| | |_|/ | |/| | | | | | | | | | Change-Id: Ifcfec09b669d8b2012b1c960bd4b1471c7946870
* | | | am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st step"" into ↵Tadashi G. Takaoka2013-02-281-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '8ef4774a8614e8b67f995f016d3200ff3fd16e30': Revert "Fix description of setup wizard 1st step"
| * | | Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-devTadashi G. Takaoka2013-02-281-1/+1
| |\ \ \
| | * | | Revert "Fix description of setup wizard 1st step"Tadashi G. Takaoka2013-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b5f4cac53266e6c3783b6a0ff62f40f2e293c24f Change-Id: Ic5787fcf63663885285c20403534572d5e7d7696
* | | | | am 3516a1f6: Merge "Fix description of setup wizard 1st step" into jb-mr2-devTadashi G. Takaoka2013-02-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '3516a1f6ddcb9cc608b2e783143f5f4eded31a1f': Fix description of setup wizard 1st step
| * | | | Merge "Fix description of setup wizard 1st step" into jb-mr2-devTadashi G. Takaoka2013-02-281-1/+1
| |\| | |
| | * | | Fix description of setup wizard 1st stepTadashi G. Takaoka2013-02-281-1/+1
| | | |/ | | |/| | | | | | | | | | | | | Bug: 8265778 Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16
* | | | am 18e21d58: Remove closing method from KeyboardViewTadashi G. Takaoka2013-02-283-9/+0
|\| | | | |_|/ |/| | | | | | | | * commit '18e21d58f7c0b5c5c001835c093221c573a841c4': Remove closing method from KeyboardView
| * | Remove closing method from KeyboardViewTadashi G. Takaoka2013-02-273-9/+0
| |/ | | | | | | | | | | | | This is a follow up of Ie00ba827. After the change, the KeyboardView.closing() method does nothing important. Change-Id: I9659ea56ce82a95f8798a4136bf93f164b67fae7
* | Merge "[TestPrep18] Make class public for testing"Kurt Partridge2013-02-281-1/+1
|\ \
| * | [TestPrep18] Make class public for testingKurt Partridge2013-02-261-1/+1
| | | | | | | | | | | | Change-Id: I4b457f44dd6a5a595c61a62061ea02c251fa9ab1
* | | Merge "[TestPrep17] Allow fake dictionary for testing"Kurt Partridge2013-02-271-0/+13
|\| |
| * | [TestPrep17] Allow fake dictionary for testingKurt Partridge2013-02-261-0/+13
| | | | | | | | | | | | | | | | | | | | | Currently ResearchLog requires a full dictionary to perform privacy-related checks. This makes testing difficult. This change allows a fake dictionary to be used instead. Change-Id: Ifca5bd8647475a6b84e4324117e0faa0a35479ee
* | | am 016046eb: Keep Keyboard object while closing KeyboardViewTadashi G. Takaoka2013-02-271-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit '016046eb4e3ea28745b9a29c41c126801f177f58': Keep Keyboard object while closing KeyboardView
| * | Keep Keyboard object while closing KeyboardViewTadashi G. Takaoka2013-02-271-1/+1
| | | | | | | | | | | | | | | Bug: 8217626 Change-Id: Ie00ba827bc391aa152427965c57488b66308a75c
* | | Import translations. DO NOT MERGEBaligh Uddin2013-02-2728-606/+306
| | | | | | | | | | | | | | | Change-Id: Ib43ed30fcf7d9be1d29af9da9dfe148371a3aec7 Auto-generated-cl: translation import
* | | Merge "Ensure Preference listener is unregistered"Kurt Partridge2013-02-272-0/+9
|\ \ \ | |_|/ |/| |
| * | Ensure Preference listener is unregisteredKurt Partridge2013-02-262-0/+9
| | | | | | | | | | | | Change-Id: I1a4d1e7bc45fc30cb1b63ea6020f0eee6e804333
* | | Merge "[TestPrep11] Only use mHasWrittenData to control ↵Kurt Partridge2013-02-271-9/+5
|\ \ \ | | | | | | | | | | | | JsonWriter#endArray() call"
| * | | [TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() callKurt Partridge2013-02-261-9/+5
| | | | | | | | | | | | | | | | Change-Id: If2107e38575b009a4c372194ecd827e27bdbb2b4
* | | | Merge "[TestPrep10] Add some comments"Kurt Partridge2013-02-261-4/+28
|\| | |
| * | | [TestPrep10] Add some commentsKurt Partridge2013-02-261-4/+28
| |/ / | | | | | | | | | Change-Id: Ia8e0bd72b0dc09bfc256ec5d1996637554376b5f
* | | am 183fe800: Small cleanup of RunInLocaleTadashi G. Takaoka2013-02-261-2/+3
|\ \ \ | |/ / |/| / | |/ | | * commit '183fe8003163702a0ba9487d6fde2a7c025ab91a': Small cleanup of RunInLocale
| * Small cleanup of RunInLocaleTadashi G. Takaoka2013-02-261-2/+3
| | | | | | | | Change-Id: Ib588e67da2c88345fc4eb51587b07ebfa434e0bb
* | Import translations. DO NOT MERGEBaligh Uddin2013-02-2518-410/+206
|/ | | | | Change-Id: I6592c412b60b21baaae7716dc897a65060463161 Auto-generated-cl: translation import
* Merge "Send the dictionaries descriptions to the dict pack"Jean Chalard2013-02-232-3/+16
|\
| * Send the dictionaries descriptions to the dict packJean Chalard2013-02-232-3/+16
| | | | | | | | | | Bug: 8255795 Change-Id: I12a5922f50c2d2e3aa639457abcc1483e6a48721