aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | am abaf5827: Separate suggestions from SuggestionViewJean Chalard2013-03-013-29/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351': Separate suggestions from SuggestionView
| | * | | | | | | | | | | | Separate suggestions from SuggestionViewJean Chalard2013-02-283-29/+44
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cleanup change, but it's also necessary for Bug: 8152758 Change-Id: Id6ba06243f573fdb856f87d1df03277c9f2e5e71
* | | | | | | | | | | | | am 50705703: am bc218dda: Merge "add a default vaule for ↵Satoshi Kataoka2013-02-281-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getMatchedProximityType" into jb-mr2-dev * commit '50705703eda5b61c0fa9d18b8239825636a139f2': add a default vaule for getMatchedProximityType
| * | | | | | | | | | | | am bc218dda: Merge "add a default vaule for getMatchedProximityType" into ↵Satoshi Kataoka2013-03-011-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'bc218dda8bd9395be0eec3836ed06fb27ce0968f': add a default vaule for getMatchedProximityType
| | * | | | | | | | | | | Merge "add a default vaule for getMatchedProximityType" into jb-mr2-devSatoshi Kataoka2013-03-011-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | add a default vaule for getMatchedProximityTypeSatoshi Kataoka2013-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id940f1226ca493d0a1b82e2810b1882184ef8987
* | | | | | | | | | | | | 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
* | | | | | | | | | am 6aaeb7fc: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-02-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6aaeb7fc34f98e9f72bfede6624c238d6ff15ccd': Import translations. DO NOT MERGE
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-2728-606/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib43ed30fcf7d9be1d29af9da9dfe148371a3aec7 Auto-generated-cl: translation import
* | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-2728-606/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I14643d519433db75403b8a7f5b9a409e316c1f1e Auto-generated-cl: translation import
* | | | | | | | | | am 424a976e: Merge "Ensure Preference listener is unregistered"Kurt Partridge2013-02-262-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '424a976e58ea40e44f28ac4b6aacc4656a4c1377': Ensure Preference listener is unregistered
| * | | | | | | | | 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
* | | | | | | | | | am 64c34122: Merge "[TestPrep11] Only use mHasWrittenData to control ↵Kurt Partridge2013-02-261-9/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JsonWriter#endArray() call" * commit '64c34122f26f58a621ca9e2f9258ab47d99a1178': [TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call
| * | | | | | | | | 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
* | | | | | | | | | | am 16cbc30a: am e621ea5f: Merge "Fix failed unit test due to resource string ↵Tadashi G. Takaoka2013-02-261-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change" into jb-mr2-dev * commit '16cbc30ae5c4b3249ff1551c7f5c2e20bd4cd299': Fix failed unit test due to resource string change
| * | | | | | | | | | am e621ea5f: Merge "Fix failed unit test due to resource string change" into ↵Tadashi G. Takaoka2013-02-271-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'e621ea5fdc4af0034c7c1d41e2d10aefc86e8aab': Fix failed unit test due to resource string change
| | * | | | | | | | | Merge "Fix failed unit test due to resource string change" into jb-mr2-devTadashi G. Takaoka2013-02-271-3/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix failed unit test due to resource string changeTadashi G. Takaoka2013-02-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7acdf6895a9769eb43ea8a1c70c0d13b32ed349
* | | | | | | | | | | | am 62abc40d: Merge "[TestPrep10] Add some comments"Kurt Partridge2013-02-261-4/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62abc40d7da0cfec3f3fa0409ae273a394167f4c': [TestPrep10] Add some comments
| * | | | | | | | | | | Merge "[TestPrep10] Add some comments"Kurt Partridge2013-02-261-4/+28
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | [TestPrep10] Add some commentsKurt Partridge2013-02-261-4/+28
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8e0bd72b0dc09bfc256ec5d1996637554376b5f
* | | | | | | | | | | am c6ee9e69: am 183fe800: Small cleanup of RunInLocaleTadashi G. Takaoka2013-02-261-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6ee9e692c02b49b2feabda494985f59eff33d68': Small cleanup of RunInLocale
| * | | | | | | | | | 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
* | | | | | | | | am f7dbd991: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-02-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7dbd991820794939992219c932276ff3fb9bf6d': Import translations. DO NOT MERGE
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-2518-410/+206
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6592c412b60b21baaae7716dc897a65060463161 Auto-generated-cl: translation import
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-07-04 15:43:02 +0000