Commit graph

11164 commits

Author SHA1 Message Date
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
837e1f7fe7 am 68b3e4e7: Merge changes I2ded3d0a,I27ad9dfb
* commit '68b3e4e7d3ad6d242915d7c087664be5889cfe9b':
  Little cleanups
  Clean up initialization ordering
2013-03-06 07:09:52 -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
6f68f3da31 am dc89d76f: Merge "Make some methods visible for testing"
* commit 'dc89d76f6b94991be42e42336afa1e9c26ab9e94':
  Make some methods visible for testing
2013-03-05 19:46:02 -08: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
149b2edb90 am 60f51684: Merge "Clean up logic in onUserLoggingConsent"
* commit '60f51684f17da17974602008441e9c927ac116d8':
  Clean up logic in onUserLoggingConsent
2013-03-05 08:44:25 -08:00
Kurt Partridge
60f51684f1 Merge "Clean up logic in onUserLoggingConsent" 2013-03-05 16:43:08 +00:00
Ken Wakasa
042020b05f Make Cyrillic Hard Signs base letters of Soft Signs per cyrillic
keyboard layouts

bug: 8269407
Change-Id: I52962ef1b6cbec125f6cfd3afc110fcbb06409df
2013-03-05 20:09:02 +09:00
Tadashi G. Takaoka
97151f1a39 am 249c8870: am 84fa8043: Merge "Add show setup wizard icon preference settings" into jb-mr2-dev
* commit '249c887008272b9f9f01bad8ae83c204eceba6f3':
  Add show setup wizard icon preference settings
2013-03-04 22:32:43 -08: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
Satoshi Kataoka
6094388f0f am ff745e9a: am 830ba674: refactor MAX_POINT_TO_KEY_LENGTH
* commit 'ff745e9a8adef082859dfbfa3ceeb16a0842980b':
  refactor MAX_POINT_TO_KEY_LENGTH
2013-03-04 22:24:48 -08:00
Tadashi G. Takaoka
84fa8043e6 Merge "Add show setup wizard icon preference settings" into jb-mr2-dev 2013-03-05 06:23:38 +00:00
Satoshi Kataoka
ff745e9a8a am 830ba674: refactor MAX_POINT_TO_KEY_LENGTH
* commit '830ba67498c6da53b38212dd9ac5ba318a00de11':
  refactor MAX_POINT_TO_KEY_LENGTH
2013-03-05 06:22:53 +00:00
Satoshi Kataoka
830ba67498 refactor MAX_POINT_TO_KEY_LENGTH
Change-Id: I3b44068bce784531516f3cdfe67b3b46b1f1b805
2013-03-05 15:10:09 +09: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
a5857b3167 am 75e6fb68: Clean up PREF_USABILITY_STUDY_MODE
* commit '75e6fb68e91b440707b399b22fbcfcd67760a949':
  Clean up PREF_USABILITY_STUDY_MODE
2013-03-04 15:15:48 -08: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
4036ec0783 am 788dc556: Merge "Remove MainLogBuffer#setSuggest()"
* commit '788dc55662585dd41a3b29d114768f80a92d8fa8':
  Remove MainLogBuffer#setSuggest()
2013-03-04 07:12:08 -08:00
Kurt Partridge
788dc55662 Merge "Remove MainLogBuffer#setSuggest()" 2013-03-04 15:10:31 +00:00
Satoshi Kataoka
8c060a76bf am e691f93c: am d8708911: Add CorrectionType
* commit 'e691f93c9dd7558b2ab92b1830683a17d74659a5':
  Add CorrectionType
2013-03-04 01:00:54 -08:00
Satoshi Kataoka
e691f93c9d am d8708911: Add CorrectionType
* commit 'd8708911709527bb88de4f5a776ec7a20391fe37':
  Add CorrectionType
2013-03-04 08:59:42 +00:00
Satoshi Kataoka
d870891170 Add CorrectionType
Change-Id: Ibbad8476be40e322cadfbf9636a13e575338ec1d
2013-03-04 17:47:47 +09:00
Satoshi Kataoka
3cb8e95de0 am 81d43233: am 19304724: Merge "Cleanup getProximityType" into jb-mr2-dev
* commit '81d43233f58281fe5b13d8561b9d39ea1b1dc80d':
  Cleanup getProximityType
2013-03-03 23:26:01 -08:00
Satoshi Kataoka
81d43233f5 am 19304724: Merge "Cleanup getProximityType" into jb-mr2-dev
* commit '1930472404104139f93c5a88d29bfc8b837fb198':
  Cleanup getProximityType
2013-03-04 07:25:00 +00:00
Satoshi Kataoka
1930472404 Merge "Cleanup getProximityType" into jb-mr2-dev 2013-03-04 07:20:31 +00:00
Ken Wakasa
471a69e308 am 31a53867: am a8d3d509: Small cleanup in CompatUtils
* commit '31a5386794a9d1a13c6390501e8713552f53fe79':
  Small cleanup in CompatUtils
2013-03-03 19:58:26 -08: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
1922fc3c73 am a8e668c8: Merge "Move UUID preference reading to ResearchSettings.java"
* commit 'a8e668c81e1302c726624effd303afbed7f74002':
  Move UUID preference reading to ResearchSettings.java
2013-03-01 17:52:06 -08:00
Kurt Partridge
a8e668c81e Merge "Move UUID preference reading to ResearchSettings.java" 2013-03-02 01:50:03 +00:00
Baligh Uddin
386c8a1f45 am 96de3622: (-s ours) am 7d2e465a: (-s ours) Import translations. DO NOT MERGE
* commit '96de3622de0733e8a79d9192158356ee7b15652e':
  Import translations. DO NOT MERGE
2013-03-01 14:45:10 -08:00
Baligh Uddin
6a8cfc621b am 4f69ffad: (-s ours) Import translations. DO NOT MERGE
* commit '4f69ffad274646348cb6602ad2edc3f2eb8cf041':
  Import translations. DO NOT MERGE
2013-03-01 14:45:09 -08:00
Baligh Uddin
96de3622de am 7d2e465a: (-s ours) Import translations. DO NOT MERGE
* commit '7d2e465ac02157aede689ca3146c9aee79de898c':
  Import translations. DO NOT MERGE
2013-03-01 22:43:51 +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
465ed2436d Import translations. DO NOT MERGE
Change-Id: I545d16f26fc007432057bc1520e0d85226f026d3
Auto-generated-cl: translation import
2013-03-01 12:13:22 -08:00
Baligh Uddin
fa0f05487e Import translations. DO NOT MERGE
Change-Id: If6d46dc75d94094554f018a3bc20d20363cab21a
Auto-generated-cl: translation import
2013-03-01 12:12:24 -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
fff70f11a8 am 578e71e2: am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-dev
* commit '578e71e28b8c95974ef7492a08d732735255c61d':
  Add setup wizard launcher icon
2013-03-01 08:15:43 -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
2223aa904a am bc258870: Merge "[TestPrep22] Make variable package-private for testing"
* commit 'bc2588708abd548c83fd04a3b7f565bffc7d052f':
  [TestPrep22] Make variable package-private for testing
2013-03-01 07:46:48 -08:00
Kurt Partridge
bc2588708a Merge "[TestPrep22] Make variable package-private for testing" 2013-03-01 14:48:43 +00:00
Tadashi G. Takaoka
d1258a0276 am 2d8d20f4: am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string resources" into jb-mr2-dev
* commit '2d8d20f4458db015f1a38d9128a4c933c7f2a7ed':
  Add translatable="false" to setup wizard's string resources
2013-03-01 05:32:17 -08: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