aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | am 60f51684: Merge "Clean up logic in onUserLoggingConsent"Kurt Partridge2013-03-052-17/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '60f51684f17da17974602008441e9c927ac116d8': Clean up logic in onUserLoggingConsent
| * | | | | | | | | | Merge "Clean up logic in onUserLoggingConsent"Kurt Partridge2013-03-052-17/+17
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | 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
* | | | | | | | | | | am 249c8870: am 84fa8043: Merge "Add show setup wizard icon preference ↵Tadashi G. Takaoka2013-03-045-32/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings" into jb-mr2-dev * commit '249c887008272b9f9f01bad8ae83c204eceba6f3': Add show setup wizard icon preference settings
| * | | | | | | | | | am 84fa8043: Merge "Add show setup wizard icon preference settings" into ↵Tadashi G. Takaoka2013-03-055-32/+57
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '84fa8043e6bef47378b3fc32c277e33034d5c174': Add show setup wizard icon preference settings
| | * | | | | | | | | Merge "Add show setup wizard icon preference settings" into jb-mr2-devTadashi G. Takaoka2013-03-055-32/+57
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add show setup wizard icon preference settingsTadashi G. Takaoka2013-03-055-32/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8239067 Change-Id: If6106a3632d3abad3e22ce29f1351525a5152ec7
* | | | | | | | | | | | am ff745e9a: am 830ba674: refactor MAX_POINT_TO_KEY_LENGTHSatoshi Kataoka2013-03-046-10/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff745e9a8adef082859dfbfa3ceeb16a0842980b': refactor MAX_POINT_TO_KEY_LENGTH
| * | | | | | | | | | | am 830ba674: refactor MAX_POINT_TO_KEY_LENGTHSatoshi Kataoka2013-03-056-10/+11
| |\| | | | | | | | | | | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '830ba67498c6da53b38212dd9ac5ba318a00de11': refactor MAX_POINT_TO_KEY_LENGTH
| | * | | | | | | | | refactor MAX_POINT_TO_KEY_LENGTHSatoshi Kataoka2013-03-056-10/+11
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b44068bce784531516f3cdfe67b3b46b1f1b805
* | | | | | | | | | am 75e6fb68: Clean up PREF_USABILITY_STUDY_MODEKurt Partridge2013-03-044-15/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '75e6fb68e91b440707b399b22fbcfcd67760a949': Clean up PREF_USABILITY_STUDY_MODE
| * | | | | | | | | 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
* | | | | | | | | | 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 e691f93c: am d8708911: Add CorrectionTypeSatoshi Kataoka2013-03-041-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e691f93c9dd7558b2ab92b1830683a17d74659a5': Add CorrectionType
| * | | | | | | | | am d8708911: Add CorrectionTypeSatoshi Kataoka2013-03-041-0/+14
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8708911709527bb88de4f5a776ec7a20391fe37': Add CorrectionType
| | * | | | | | | | Add CorrectionTypeSatoshi Kataoka2013-03-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbad8476be40e322cadfbf9636a13e575338ec1d
* | | | | | | | | | am 81d43233: am 19304724: Merge "Cleanup getProximityType" into jb-mr2-devSatoshi Kataoka2013-03-034-21/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81d43233f58281fe5b13d8561b9d39ea1b1dc80d': Cleanup getProximityType
| * | | | | | | | | am 19304724: Merge "Cleanup getProximityType" into jb-mr2-devSatoshi Kataoka2013-03-044-21/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1930472404104139f93c5a88d29bfc8b837fb198': Cleanup getProximityType
| | * | | | | | | | Merge "Cleanup getProximityType" into jb-mr2-devSatoshi Kataoka2013-03-044-21/+44
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Cleanup getProximityTypeSatoshi Kataoka2013-03-014-21/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89c5871bbcf0fe3d5f50052e8f64932d8efbce94
* | | | | | | | | | | 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
* | | | | | | | | | | 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
* | | | | | | | | | | | am 96de3622: (-s ours) am 7d2e465a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96de3622de0733e8a79d9192158356ee7b15652e': Import translations. DO NOT MERGE
| * | | | | | | | | | | am 7d2e465a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d2e465ac02157aede689ca3146c9aee79de898c': Import translations. DO NOT MERGE
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-0149-1174/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1852e989314ddd2e3f806486a0774ffe446473e8 Auto-generated-cl: translation import
* | | | | | | | | | | | am 4f69ffad: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f69ffad274646348cb6602ad2edc3f2eb8cf041': Import translations. DO NOT MERGE
| * | | | | | | | | | | 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 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