aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* [FileEncap7] Extract uploadContents methodKurt Partridge2013-03-071-8/+11
| | | | Change-Id: I018b2726533042dbcb25713ea039aec41c148db2
* Merge "[FileEncap6] Extract Uploader class"Kurt Partridge2013-03-082-162/+197
|\
| * [FileEncap6] Extract Uploader classKurt Partridge2013-03-072-162/+197
| | | | | | | | | | | | Gerrit was stuck on original change I9ef4eb7450 Change-Id: I6d4ee686944074779aca5b09b018782c7033874d
* | Import translations. DO NOT MERGEBaligh Uddin2013-03-071-2/+2
|/ | | | | Change-Id: I363753d020e086f5a60abd84377afff7a4b280ea Auto-generated-cl: translation import
* Merge "[FileEncap5] Move conditional logic to caller"Kurt Partridge2013-03-061-3/+4
|\
| * [FileEncap5] Move conditional logic to callerKurt Partridge2013-03-061-3/+4
| | | | | | | | Change-Id: I6599539059f86dc8902210d325439c08035b2e2a
* | Merge "[FileEncap4] Simplify logic"Kurt Partridge2013-03-061-4/+5
|\|
| * [FileEncap4] Simplify logicKurt Partridge2013-03-061-4/+5
| | | | | | | | Change-Id: Ibb8660d12812b867856259d3e5c04a31e281027d
* | Merge "[FileEncap3] Extract isUploadingUnconditionally method"Kurt Partridge2013-03-061-5/+8
|\|
| * [FileEncap3] Extract isUploadingUnconditionally methodKurt Partridge2013-03-061-5/+8
| | | | | | | | | | | | - remove isUploadingUnconditionally local variable Change-Id: I69be8708c1f306568cbb9c5cbefc9e42a87df497
* | Merge "[FileEncap2] Remove mCanUpload instance variable"Kurt Partridge2013-03-061-6/+5
|\|
| * [FileEncap2] Remove mCanUpload instance variableKurt Partridge2013-03-061-6/+5
| | | | | | | | Change-Id: I62a100c4d73bb64a14a7994f7dd9af7b6946d064
* | Merge "[FileEncap1] Extract hasUploadingPermisssions method"Kurt Partridge2013-03-061-4/+7
|\|
| * [FileEncap1] Extract hasUploadingPermisssions methodKurt Partridge2013-03-061-4/+7
| | | | | | | | Change-Id: Ica1dabcf066cde6580035f12fa35a404cb32fb3f
* | 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
* | 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
* | | 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 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
* | | 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
* | | 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 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
* | | 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
* | | 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
* | | | 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 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 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
* | | | | 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 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 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
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-31 17:21:41 +0000