aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge "[FileEncap1] Extract hasUploadingPermisssions method"Kurt Partridge2013-03-061-4/+7
| |\| |
| | * | [FileEncap1] Extract hasUploadingPermisssions methodKurt Partridge2013-03-061-4/+7
| | | | | | | | | | | | | | | | Change-Id: Ica1dabcf066cde6580035f12fa35a404cb32fb3f
* | | | am 68b3e4e7: Merge changes I2ded3d0a,I27ad9dfbKurt Partridge2013-03-061-36/+28
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '68b3e4e7d3ad6d242915d7c087664be5889cfe9b': Little cleanups Clean up initialization ordering
| * | | Merge changes I2ded3d0a,I27ad9dfbKurt Partridge2013-03-061-36/+28
| |\| | | | | | | | | | | | | | | | | | | | | | * changes: Little cleanups Clean up initialization ordering
| | * | 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
* | | | am dc89d76f: Merge "Make some methods visible for testing"Kurt Partridge2013-03-051-0/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'dc89d76f6b94991be42e42336afa1e9c26ab9e94': Make some methods visible for testing
| * | | Merge "Make some methods visible for testing"Kurt Partridge2013-03-061-0/+3
| |\ \ \
| | * | | Make some methods visible for testingKurt Partridge2013-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 8302967 multi-project commit with Icf915abb57ef00840ee93b67a25db42ba51f1c38 Change-Id: I105bda5bdff871508140fb99487dddbf17992790
* | | | | 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
| | * | Add show setup wizard icon preference settingsTadashi G. Takaoka2013-03-055-32/+57
| | | | | | | | | | | | | | | | | | | | Bug: 8239067 Change-Id: If6106a3632d3abad3e22ce29f1351525a5152ec7
* | | | 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 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
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-01 21:51:32 +0000