aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am ee3261ff: [FileEncap7] Extract uploadContents methodKurt Partridge2013-03-071-8/+11
|\ | | | | | | | | * commit 'ee3261ff558ee734e15af5424f98bb8d8776795f': [FileEncap7] Extract uploadContents method
| * [FileEncap7] Extract uploadContents methodKurt Partridge2013-03-071-8/+11
| | | | | | | | Change-Id: I018b2726533042dbcb25713ea039aec41c148db2
* | am bca8348e: Merge "[FileEncap6] Extract Uploader class"Kurt Partridge2013-03-072-162/+197
|\| | | | | | | | | * commit 'bca8348e988170506c6c6ffc862f3377cf60dc8e': [FileEncap6] Extract Uploader class
| * 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 "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-03-071-2/+2
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-03-061-2/+2
| | | | | | | | | | | | | | | Change-Id: I715549b3e9bad6dd856883af8b6e828798921e38 Auto-generated-cl: translation import
* | | am 41c471d9: Merge "[FileEncap5] Move conditional logic to caller"Kurt Partridge2013-03-061-3/+4
|\ \ \ | | |/ | |/| | | | | | | * commit '41c471d93d117a65a4f241e588154d84709cf5d0': [FileEncap5] Move conditional logic to caller
| * | 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
* | | | am 1bc20700: Merge "[FileEncap4] Simplify logic"Kurt Partridge2013-03-061-4/+5
|\| | | | | | | | | | | | | | | | | | | * commit '1bc20700d594af28bb87575df4279b0bed624c52': [FileEncap4] Simplify logic
| * | | Merge "[FileEncap4] Simplify logic"Kurt Partridge2013-03-061-4/+5
| |\| |
| | * | [FileEncap4] Simplify logicKurt Partridge2013-03-061-4/+5
| | | | | | | | | | | | | | | | Change-Id: Ibb8660d12812b867856259d3e5c04a31e281027d
* | | | am 719bb3aa: Merge "[FileEncap3] Extract isUploadingUnconditionally method"Kurt Partridge2013-03-061-5/+8
|\| | | | | | | | | | | | | | | | | | | * commit '719bb3aa39c6456b7d672258432d18ad917ba263': [FileEncap3] Extract isUploadingUnconditionally method
| * | | 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
* | | | am 5e5b6b78: Merge "[FileEncap2] Remove mCanUpload instance variable"Kurt Partridge2013-03-061-6/+5
|\| | | | | | | | | | | | | | | | | | | * commit '5e5b6b78709b055ac5ed71153c0a696c63201a38': [FileEncap2] Remove mCanUpload instance variable
| * | | 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
* | | | am b000e94e: Merge "[FileEncap1] Extract hasUploadingPermisssions method"Kurt Partridge2013-03-061-4/+7
|\| | | | |_|/ |/| | | | | | | | * commit 'b000e94eea988e58fe5de7cb1a2f8fc03acfd4b3': [FileEncap1] Extract hasUploadingPermisssions method
| * | 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