aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am 788dc556: Merge "Remove MainLogBuffer#setSuggest()"Kurt Partridge2013-03-043-11/+14
|\ | | | | | | | | * commit '788dc55662585dd41a3b29d114768f80a92d8fa8': Remove MainLogBuffer#setSuggest()
| * 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 31a53867: am a8d3d509: Small cleanup in CompatUtilsKen Wakasa2013-03-031-4/+4
|\| | | | | | | | | | | | | | * commit '31a5386794a9d1a13c6390501e8713552f53fe79': Small cleanup in CompatUtils
| * | 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
* | | | am a8e668c8: Merge "Move UUID preference reading to ResearchSettings.java"Kurt Partridge2013-03-012-19/+45
|\| | | | | | | | | | | | | | | | | | | * commit 'a8e668c81e1302c726624effd303afbed7f74002': Move UUID preference reading to ResearchSettings.java
| * | | 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
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-0149-586/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: If6d46dc75d94094554f018a3bc20d20363cab21a Auto-generated-cl: translation import
* | | | am 578e71e2: am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-devTadashi G. Takaoka2013-03-018-20/+208
|\| | | | | | | | | | | | | | | | | | | * commit '578e71e28b8c95974ef7492a08d732735255c61d': Add setup wizard launcher icon
| * | | 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
* | | | | am bc258870: Merge "[TestPrep22] Make variable package-private for testing"Kurt Partridge2013-03-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc2588708abd548c83fd04a3b7f565bffc7d052f': [TestPrep22] Make variable package-private for testing
| * | | | 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 2d8d20f4: am 5c681c17: Merge "Add translatable="false" to setup wizard\'s ↵Tadashi G. Takaoka2013-03-011-10/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string resources" into jb-mr2-dev * commit '2d8d20f4458db015f1a38d9128a4c933c7f2a7ed': Add translatable="false" to setup wizard's string resources
| * | | | | 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 31747ba7: am abaf5827: Separate suggestions from SuggestionViewJean Chalard2013-02-282-20/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31747ba7874f57fe6b259e8744e42dbfe02a8d40': Separate suggestions from SuggestionView
| * | | | | | 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
* | | | | | am 9ba7ad8d: Merge "[TestPrep20] Clean up import statement"Kurt Partridge2013-02-281-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ba7ad8d4f399d31251c74f5f5116c8d580500cf': [TestPrep20] Clean up import statement
| * | | | | 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 100b6ae5: am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st ↵Tadashi G. Takaoka2013-02-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | step"" into jb-mr2-dev * commit '100b6ae5cadee35720a44c071211a436e7b8c80a': Revert "Fix description of setup wizard 1st step"
| * | | | 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 3ccb97a7: am 3516a1f6: Merge "Fix description of setup wizard 1st step" ↵Tadashi G. Takaoka2013-02-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '3ccb97a7cdb2536962d9081da03b473d5df37d16': Fix description of setup wizard 1st step
| * | | | | 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 040b442f: am 18e21d58: Remove closing method from KeyboardViewTadashi G. Takaoka2013-02-283-9/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '040b442f3cd4c0a212ef7e2ec0c55541b67ec7ce': Remove closing method from KeyboardView
| * | | | 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
* | | am abaa88fd: Merge "[TestPrep18] Make class public for testing"Kurt Partridge2013-02-271-1/+1
|\| | | | | | | | | | | | | | * commit 'abaa88fd4e33de54f3efd980ac0fef4935e439db': [TestPrep18] Make class public for testing
| * | 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
* | | | am a04fbce4: Merge "[TestPrep17] Allow fake dictionary for testing"Kurt Partridge2013-02-271-0/+13
|\| | | | | | | | | | | | | | | | | | | * commit 'a04fbce41273b0b7d464e4d823de5f0d54549673': [TestPrep17] Allow fake dictionary for testing
| * | | 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 2ed1ec41: am 016046eb: Keep Keyboard object while closing KeyboardViewTadashi G. Takaoka2013-02-271-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '2ed1ec411d8b539890359f8ced8e1fe8d90344cd': Keep Keyboard object while closing KeyboardView
| * | | 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
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-01 20:00:54 +0000