Kurt Partridge
bca8348e98
Merge "[FileEncap6] Extract Uploader class"
2013-03-08 00:37:14 +00:00
Kurt Partridge
4436446e9b
[FileEncap6] Extract Uploader class
...
Gerrit was stuck on original change I9ef4eb7450
Change-Id: I6d4ee686944074779aca5b09b018782c7033874d
2013-03-07 16:19:44 -08:00
Baligh Uddin
adfa9b9a94
Import translations. DO NOT MERGE
...
Change-Id: I363753d020e086f5a60abd84377afff7a4b280ea
Auto-generated-cl: translation import
2013-03-07 15:05:01 +00:00
Kurt Partridge
41c471d93d
Merge "[FileEncap5] Move conditional logic to caller"
2013-03-06 20:59:04 +00:00
Kurt Partridge
1bc20700d5
Merge "[FileEncap4] Simplify logic"
2013-03-06 20:05:47 +00:00
Kurt Partridge
719bb3aa39
Merge "[FileEncap3] Extract isUploadingUnconditionally method"
2013-03-06 19:14:52 +00:00
Kurt Partridge
5e5b6b7870
Merge "[FileEncap2] Remove mCanUpload instance variable"
2013-03-06 18:39:07 +00:00
Kurt Partridge
b000e94eea
Merge "[FileEncap1] Extract hasUploadingPermisssions method"
2013-03-06 18:02:26 +00:00
Kurt Partridge
9283644c41
[FileEncap5] Move conditional logic to caller
...
Change-Id: I6599539059f86dc8902210d325439c08035b2e2a
2013-03-06 07:19:41 -08:00
Kurt Partridge
88f466678c
[FileEncap4] Simplify logic
...
Change-Id: Ibb8660d12812b867856259d3e5c04a31e281027d
2013-03-06 07:19:41 -08:00
Kurt Partridge
7f7850d23a
[FileEncap3] Extract isUploadingUnconditionally method
...
- remove isUploadingUnconditionally local variable
Change-Id: I69be8708c1f306568cbb9c5cbefc9e42a87df497
2013-03-06 07:19:41 -08:00
Kurt Partridge
466e665b3c
[FileEncap2] Remove mCanUpload instance variable
...
Change-Id: I62a100c4d73bb64a14a7994f7dd9af7b6946d064
2013-03-06 07:19:41 -08:00
Kurt Partridge
347b2ebebf
[FileEncap1] Extract hasUploadingPermisssions method
...
Change-Id: Ica1dabcf066cde6580035f12fa35a404cb32fb3f
2013-03-06 07:19:41 -08:00
Kurt Partridge
68b3e4e7d3
Merge changes I2ded3d0a,I27ad9dfb
...
* changes:
Little cleanups
Clean up initialization ordering
2013-03-06 15:08:08 +00:00
Kurt Partridge
dc89d76f6b
Merge "Make some methods visible for testing"
2013-03-06 03:43:55 +00:00
Kurt Partridge
25343124dd
Make some methods visible for testing
...
bug: 8302967
multi-project commit with Icf915abb57ef00840ee93b67a25db42ba51f1c38
Change-Id: I105bda5bdff871508140fb99487dddbf17992790
2013-03-05 19:28:31 -08:00
Kurt Partridge
84bc16af3e
Little cleanups
...
Change-Id: I2ded3d0a29610941fac27c9b26168dd6c06ceccc
2013-03-05 18:37:44 -08:00
Kurt Partridge
4eeb90cd72
Clean up initialization ordering
...
This change is based on an earlier one that got stuck in Gerrit: Iab77504b
Change-Id: I27ad9dfb1bbb2300bd1e61d881a6ea0e116db066
2013-03-05 18:37:00 -08:00
Kurt Partridge
60f51684f1
Merge "Clean up logic in onUserLoggingConsent"
2013-03-05 16:43:08 +00:00
Tadashi G. Takaoka
249c887008
am 84fa8043: Merge "Add show setup wizard icon preference settings" into jb-mr2-dev
...
* commit '84fa8043e6bef47378b3fc32c277e33034d5c174':
Add show setup wizard icon preference settings
2013-03-05 06:30:33 +00:00
Tadashi G. Takaoka
2e1b55f796
Add show setup wizard icon preference settings
...
Bug: 8239067
Change-Id: If6106a3632d3abad3e22ce29f1351525a5152ec7
2013-03-05 14:56:41 +09:00
Kurt Partridge
157c00145b
Clean up logic in onUserLoggingConsent
...
- 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
2013-03-04 12:05:03 -08:00
Kurt Partridge
75e6fb68e9
Clean up PREF_USABILITY_STUDY_MODE
...
- 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
2013-03-04 12:05:03 -08:00
Kurt Partridge
788dc55662
Merge "Remove MainLogBuffer#setSuggest()"
2013-03-04 15:10:31 +00:00
Ken Wakasa
31a5386794
am a8d3d509: Small cleanup in CompatUtils
...
* commit 'a8d3d50970cecf961940efc0e908fbb2f9b35472':
Small cleanup in CompatUtils
2013-03-04 03:56:05 +00:00
Ken Wakasa
a8d3d50970
Small cleanup in CompatUtils
...
Change-Id: I9b4a8d7eae744ba6252a6475b75240248c70a3c0
2013-03-02 17:18:18 +09:00
Kurt Partridge
a8e668c81e
Merge "Move UUID preference reading to ResearchSettings.java"
2013-03-02 01:50:03 +00:00
Kurt Partridge
b094372bd6
Remove MainLogBuffer#setSuggest()
...
multi-project commit with Ia98b1406fc2ee11a96893c77ea58d800fece7624
Change-Id: I8bc3d07b83dbe7d8fc56a618de07dade7f510b13
2013-03-01 13:32:11 -08:00
Baligh Uddin
4f69ffad27
Import translations. DO NOT MERGE
...
Change-Id: Ic31bc6d188785972dd3f11d96ff22592040ceb9f
Auto-generated-cl: translation import
2013-03-01 12:19:21 -08:00
Baligh Uddin
7d2e465ac0
Import translations. DO NOT MERGE
...
Change-Id: I1852e989314ddd2e3f806486a0774ffe446473e8
Auto-generated-cl: translation import
2013-03-01 12:11:04 -08:00
Tadashi G. Takaoka
578e71e28b
am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-dev
...
* commit '99b0dc6f0d18f5fdd8634e8fa533bf1b3f81a538':
Add setup wizard launcher icon
2013-03-01 16:13:45 +00:00
Tadashi G. Takaoka
99b0dc6f0d
Merge "Add setup wizard launcher icon" into jb-mr2-dev
2013-03-01 16:08:09 +00:00
Kurt Partridge
bc2588708a
Merge "[TestPrep22] Make variable package-private for testing"
2013-03-01 14:48:43 +00:00
Tadashi G. Takaoka
2d8d20f445
am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string resources" into jb-mr2-dev
...
* commit '5c681c17cec355d2cf839e0dfcc38c9bf37f5f0a':
Add translatable="false" to setup wizard's string resources
2013-03-01 13:29:29 +00:00
Tadashi G. Takaoka
1ffdaafd83
Add setup wizard launcher icon
...
The setup wizard icon will be hidden if the Android Keyboard is in
system image.
Bug: 8239067
Change-Id: Ib0c0c9e3a0954512c3e03e42a661cdf86eff0dca
2013-03-01 22:28:00 +09:00
Tadashi G. Takaoka
5c681c17ce
Merge "Add translatable="false" to setup wizard's string resources" into jb-mr2-dev
2013-03-01 13:26:26 +00:00
Jean Chalard
31747ba787
am abaf5827: Separate suggestions from SuggestionView
...
* commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351':
Separate suggestions from SuggestionView
2013-03-01 05:17:52 +00:00
Jean Chalard
abaf5827e7
Separate suggestions from SuggestionView
...
This is a cleanup change, but it's also necessary for
Bug: 8152758
Change-Id: Id6ba06243f573fdb856f87d1df03277c9f2e5e71
2013-02-28 21:03:18 -08:00
Tadashi G. Takaoka
419e3e5261
Add translatable="false" to setup wizard's string resources
...
Bug: 8265778
Change-Id: I351dc2b88e4fa33c2008107a1d6d19940c4db6ab
2013-03-01 13:31:57 +09:00
Kurt Partridge
00ed4704f9
Move UUID preference reading to ResearchSettings.java
...
Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb
2013-02-28 19:54:21 -08:00
Kurt Partridge
9ba7ad8d4f
Merge "[TestPrep20] Clean up import statement"
2013-03-01 01:32:35 +00:00
Tadashi G. Takaoka
100b6ae5ca
am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
...
* commit '8ef4774a8614e8b67f995f016d3200ff3fd16e30':
Revert "Fix description of setup wizard 1st step"
2013-02-28 22:38:26 +00:00
Tadashi G. Takaoka
3ccb97a7cd
am 3516a1f6: Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
...
* commit '3516a1f6ddcb9cc608b2e783143f5f4eded31a1f':
Fix description of setup wizard 1st step
2013-02-28 22:38:25 +00:00
Tadashi G. Takaoka
040b442f3c
am 18e21d58: Remove closing method from KeyboardView
...
* commit '18e21d58f7c0b5c5c001835c093221c573a841c4':
Remove closing method from KeyboardView
2013-02-28 22:38:11 +00:00
Kurt Partridge
59912837b3
[TestPrep22] Make variable package-private for testing
...
Change-Id: I902a6a40df1c672c611672f34d2f3237b0d1821b
2013-02-28 06:45:35 -08:00
Kurt Partridge
5cd50faaca
[TestPrep20] Clean up import statement
...
Change-Id: Ifcfec09b669d8b2012b1c960bd4b1471c7946870
2013-02-28 06:45:34 -08:00
Tadashi G. Takaoka
8ef4774a86
Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
2013-02-28 10:28:50 +00:00
Tadashi G. Takaoka
e359789593
Revert "Fix description of setup wizard 1st step"
...
This reverts commit b5f4cac532
Change-Id: Ic5787fcf63663885285c20403534572d5e7d7696
2013-02-28 10:25:42 +00:00
Tadashi G. Takaoka
3516a1f6dd
Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
2013-02-28 07:55:53 +00:00
Tadashi G. Takaoka
b5f4cac532
Fix description of setup wizard 1st step
...
Bug: 8265778
Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16
2013-02-28 16:55:11 +09:00