aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | 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 61d2e10b: am f06ab499: Merge "rename define" into jb-mr2-devSatoshi Kataoka2013-03-011-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '61d2e10bd30050a9e851e5625857c7f17e34e544': rename define
| * | | | | | | | | | | | am f06ab499: Merge "rename define" into jb-mr2-devSatoshi Kataoka2013-03-011-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f06ab499999ead130660e5bc17324225503994ad': rename define
| | * | | | | | | | | | | Merge "rename define" into jb-mr2-devSatoshi Kataoka2013-03-011-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | rename defineSatoshi Kataoka2013-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4767eff187c76541648cc066a88293e46a90f033
* | | | | | | | | | | | | | am 31747ba7: am abaf5827: Separate suggestions from SuggestionViewJean Chalard2013-02-283-29/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31747ba7874f57fe6b259e8744e42dbfe02a8d40': Separate suggestions from SuggestionView
| * | | | | | | | | | | | | 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
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-04 08:34:52 +0000