Commit Graph

3450 Commits

Author SHA1 Message Date
Makoto Onuki
353b75b04b Fix NPE -- check isCancelled in onPostExecute
Bug 3024665

Change-Id: I97c122a6c66a7d4245187961cb90ea874d0e305d
2010-09-22 13:12:13 -07:00
Makoto Onuki
1ef511dafd Merge "Ignore and log OOM during bitmap creation" 2010-09-22 13:10:22 -07:00
Andy Stadler
dbcef318e9 am def16a33: (-s ours) am ebba88e4: Merge "DO NOT MERGE disallow longpress in WebView" into gingerbread
Merge commit 'def16a33334bbf2674f7016ae0fab0c679eb5ced'

* commit 'def16a33334bbf2674f7016ae0fab0c679eb5ced':
  DO NOT MERGE disallow longpress in WebView
2010-09-22 12:04:32 -07:00
Andy Stadler
def16a3333 am ebba88e4: Merge "DO NOT MERGE disallow longpress in WebView" into gingerbread
Merge commit 'ebba88e4f4b3dd8001c6e1d2e4c1944aef613795' into gingerbread-plus-aosp

* commit 'ebba88e4f4b3dd8001c6e1d2e4c1944aef613795':
  DO NOT MERGE disallow longpress in WebView
2010-09-22 11:50:52 -07:00
Andy Stadler
ebba88e4f4 Merge "DO NOT MERGE disallow longpress in WebView" into gingerbread 2010-09-22 11:07:34 -07:00
Andrew Stadler
625451ed25 Harden thumbnail creation
* Catch some errors earlier;  Log all errors.

Bug: 2905324
Change-Id: Icdf4ec881f404787a0621e606d7e611d5e50aab1
2010-09-22 09:22:15 -07:00
Marc Blank
eff7bbe72b am d414ba53: (-s ours) am d46952e7: DO NOT MERGE: Test validity of port numbers in account setup
Merge commit 'd414ba537266c539023a242784f5281846360b03'

* commit 'd414ba537266c539023a242784f5281846360b03':
  DO NOT MERGE: Test validity of port numbers in account setup
2010-09-21 20:21:06 -07:00
Marc Blank
d414ba5372 am d46952e7: DO NOT MERGE: Test validity of port numbers in account setup
Merge commit 'd46952e7b0d47a4150d140502caf34e3a5276dd8' into gingerbread-plus-aosp

* commit 'd46952e7b0d47a4150d140502caf34e3a5276dd8':
  DO NOT MERGE: Test validity of port numbers in account setup
2010-09-21 18:24:42 -07:00
Marc Blank
d46952e7b0 DO NOT MERGE: Test validity of port numbers in account setup
Bug: 1712475
Change-Id: Iced4875379a804b5072e4df0af25db7bf9473131
2010-09-21 17:46:15 -07:00
Makoto Onuki
cc3c1d46b9 Merge "Rename misnomered constant" 2010-09-21 17:20:55 -07:00
Makoto Onuki
d7f886c5c8 Ignore and log OOM during bitmap creation
Change-Id: I00ca40d98e425eb267b601cc9049af6ecfd2883d
2010-09-21 17:09:01 -07:00
Marc Blank
a459a3e36a am aa2dd114: (-s ours) am ccfc1c29: Merge "DO NOT MERGE: Don\'t disable account box if sync freq -> "Never"" into gingerbread
Merge commit 'aa2dd11451c6b4b062f90c9a30cbcf825e33fad9'

* commit 'aa2dd11451c6b4b062f90c9a30cbcf825e33fad9':
  DO NOT MERGE: Don't disable account box if sync freq -> "Never"
2010-09-21 16:06:07 -07:00
Marc Blank
c41704df6d am 2a6dbe45: (-s ours) am 6f207f5d: DO NOT MERGE: Interpret "busy" on new events to mean "no response"
Merge commit '2a6dbe456c120edc1a621a89cb93d063490f36b7'

* commit '2a6dbe456c120edc1a621a89cb93d063490f36b7':
  DO NOT MERGE: Interpret "busy" on new events to mean "no response"
2010-09-21 16:00:37 -07:00
Marc Blank
aa2dd11451 am ccfc1c29: Merge "DO NOT MERGE: Don\'t disable account box if sync freq -> "Never"" into gingerbread
Merge commit 'ccfc1c29c2f9fff7ee824d342bde1e5d7138722b' into gingerbread-plus-aosp

* commit 'ccfc1c29c2f9fff7ee824d342bde1e5d7138722b':
  DO NOT MERGE: Don't disable account box if sync freq -> "Never"
2010-09-21 15:58:56 -07:00
Marc Blank
2a6dbe456c am 6f207f5d: DO NOT MERGE: Interpret "busy" on new events to mean "no response"
Merge commit '6f207f5df2a1b4190e5da243fd497dcf168899af' into gingerbread-plus-aosp

* commit '6f207f5df2a1b4190e5da243fd497dcf168899af':
  DO NOT MERGE: Interpret "busy" on new events to mean "no response"
2010-09-21 15:56:04 -07:00
Marc Blank
ccfc1c29c2 Merge "DO NOT MERGE: Don't disable account box if sync freq -> "Never"" into gingerbread 2010-09-21 15:54:01 -07:00
Makoto Onuki
4580c3136d Rename misnomered constant
Change-Id: I8d1024a85ad02ba7ce7ecf22f719cab34bf70307
2010-09-21 15:48:43 -07:00
Marc Blank
6f207f5df2 DO NOT MERGE: Interpret "busy" on new events to mean "no response"
* The meaning of a busy status of "Busy" is uncertain; it could mean
  "Accepted" or "Tentative", depending on whether the event was
  created via OWA/Outlook or EAS
* We have interpreted it as "Accepted", which prevents the user from
  actually accepting the event (as a state change is required for us
  to send updates to the server/organizer)
* This CL changes the behavior such that a newly arriving event with
  a "Busy" status is shown as "No response" in the Calendar, thereby
  allowing the user to pick from any of the three possible options.

Bug: 2811859
Change-Id: I321f714e54e66ee8f40f5e2c00587b98bad71a63
2010-09-21 15:30:57 -07:00
Marc Blank
77259fab1b DO NOT MERGE: Don't disable account box if sync freq -> "Never"
Bug: 2905667
Change-Id: Iec214b0fed093ff39dc70d5d821577bcf15f00ed
2010-09-21 15:25:27 -07:00
Andy Stadler
70880a7f29 DO NOT MERGE disallow longpress in WebView
* This gets very confused by the new text copy logic
* Downside is that copy from received message does not work at all
  (it didn't work anyway).
* Will fix in next release by redesigning MessageView layout and no
  longer wrapping in ScrollView

Bug: 2998892
Change-Id: Icd1219f3c45fd4da9259499e9c8a31ed0d3c4c30
2010-09-21 15:04:27 -07:00
Makoto Onuki
263ef7ddd4 Small change to MessageViewFragment
resetView() shouldn't kick LoadMessageTask(). (it's not what its name implies)
Added a TODO.

Change-Id: I0523696f3883a905d9732626824efda598bf10ed
2010-09-21 11:25:53 -07:00
Makoto Onuki
0e89a9a640 Merge "Use the default theme for selected mailbox." 2010-09-21 11:24:56 -07:00
Makoto Onuki
cb32904250 am b2999edd: (-s ours) am c6299fc0: Merge "DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers." into gingerbread
Merge commit 'b2999edd996cb2ba2e12633e0309a16441d90188'

* commit 'b2999edd996cb2ba2e12633e0309a16441d90188':
  DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers.
2010-09-21 10:56:14 -07:00
Makoto Onuki
509e46f0b4 am 723c21d0: (-s ours) am b3eefca0: DO NOT MERGE: Fix NPE in Controller and MessagingController.
Merge commit '723c21d0b0f972543bfdd3323096ab848ef2619d'

* commit '723c21d0b0f972543bfdd3323096ab848ef2619d':
  DO NOT MERGE: Fix NPE in Controller and MessagingController.
2010-09-21 10:56:10 -07:00
Makoto Onuki
b2999edd99 am c6299fc0: Merge "DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers." into gingerbread
Merge commit 'c6299fc0788afb9a066389f239cdfe630fc5c021' into gingerbread-plus-aosp

* commit 'c6299fc0788afb9a066389f239cdfe630fc5c021':
  DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers.
2010-09-21 10:52:23 -07:00
Makoto Onuki
723c21d0b0 am b3eefca0: DO NOT MERGE: Fix NPE in Controller and MessagingController.
Merge commit 'b3eefca0e1c7fffe1b015e18050aee6867bfbcdd' into gingerbread-plus-aosp

* commit 'b3eefca0e1c7fffe1b015e18050aee6867bfbcdd':
  DO NOT MERGE: Fix NPE in Controller and MessagingController.
2010-09-21 10:52:21 -07:00
Makoto Onuki
c6299fc078 Merge "DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers." into gingerbread 2010-09-21 10:49:02 -07:00
Makoto Onuki
9523ecf27e DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers.
- Merged all three BroadcastReceivers into one.
(Changed class name because old ones may have been disabled.)

- Use IntentService to perform the tasks in a worker thread.

Note the new receiver will never be disabled.  We always need to start
exchange.SyncManager.

Bug 2722155
Bug 2416929

Backport of I8241880fc1ee38d85dcdca7e1d46fc2f6b2d375b

Change-Id: I9835cf86846d842e6f2d23014bc0912c3b888a05
2010-09-21 10:48:17 -07:00
Makoto Onuki
b3eefca0e1 DO NOT MERGE: Fix NPE in Controller and MessagingController.
Bug 2553401
Bug 2186777
Bug 2721133
Bug 2684365
Bug 2530534

Backport of I5185d9196deab5ba3a9866e2de2a9be04a04ca03

Change-Id: I192267d7d48d377fe1fc083797cb199f8e94c0c4
2010-09-21 10:47:04 -07:00
Makoto Onuki
023304921a am ea61437c: (-s ours) am 0be6c7c5: Merge "DO NOT MERGE: Fix handling IOException in ImapStore" into gingerbread
Merge commit 'ea61437cf7717d194aa5cdc31b75147d681ef6ee'

* commit 'ea61437cf7717d194aa5cdc31b75147d681ef6ee':
  DO NOT MERGE: Fix handling IOException in ImapStore
2010-09-21 10:45:49 -07:00
Makoto Onuki
19eca498ab am d7e81351: (-s ours) am 32517753: Merge "DO NOT MERGE: Handle multiple IMAP SEARCH results." into gingerbread
Merge commit 'd7e8135184aa4528fb2c974c794b3c38a601c9ed'

* commit 'd7e8135184aa4528fb2c974c794b3c38a601c9ed':
  DO NOT MERGE: Handle multiple IMAP SEARCH results.
2010-09-21 10:45:47 -07:00
Makoto Onuki
ace475175d am 7bc1cee2: (-s ours) am 75c6a611: Merge "DO NOT MERGE: Test for interaction between ImapStore and vendor policy." into gingerbread
Merge commit '7bc1cee27814021df8b22d2099fe7e953bd36fac'

* commit '7bc1cee27814021df8b22d2099fe7e953bd36fac':
  DO NOT MERGE: Test for interaction between ImapStore and vendor policy.
2010-09-21 10:45:44 -07:00
Makoto Onuki
e9978fb23b am 1251fd2e: (-s ours) am 7fbdc44c: Merge "DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it." into gingerbread
Merge commit '1251fd2ef389e43663c8520245315f37d2d2d3b1'

* commit '1251fd2ef389e43663c8520245315f37d2d2d3b1':
  DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it.
2010-09-21 10:45:42 -07:00
Makoto Onuki
fbb302c6fc am d693bda0: (-s ours) am 2ef9710e: Merge "DO NOT MERGE: Implement destroy() for all ImapElement classes." into gingerbread
Merge commit 'd693bda052964849b83f6cabc8cc2cb31b82c3d0'

* commit 'd693bda052964849b83f6cabc8cc2cb31b82c3d0':
  DO NOT MERGE: Implement destroy() for all ImapElement classes.
2010-09-21 10:45:34 -07:00
Makoto Onuki
e50da5a19f am e447261c: (-s ours) am 56d04724: Merge "DO NOT MERGE: Always destroy ImapResponses." into gingerbread
Merge commit 'e447261c6a2fe411a9bf2e7e85c09febbb4b5d86'

* commit 'e447261c6a2fe411a9bf2e7e85c09febbb4b5d86':
  DO NOT MERGE: Always destroy ImapResponses.
2010-09-21 10:45:29 -07:00
Makoto Onuki
d0cf98b231 am 35a4deb6: (-s ours) am 8c02a817: Merge "DO NOT MERGE: Add TODOs to ImapStore." into gingerbread
Merge commit '35a4deb6a0534b6cf88a455211b2056311782281'

* commit '35a4deb6a0534b6cf88a455211b2056311782281':
  DO NOT MERGE: Add TODOs to ImapStore.
2010-09-21 10:45:21 -07:00
Makoto Onuki
a01ad6f587 am c24a42b5: (-s ours) am 415b27fb: Merge "DO NOT MERGE: Follow-up to the new IMAP parser." into gingerbread
Merge commit 'c24a42b5d8ba5fc03966648a76f529cc2f314001'

* commit 'c24a42b5d8ba5fc03966648a76f529cc2f314001':
  DO NOT MERGE: Follow-up to the new IMAP parser.
2010-09-21 10:45:17 -07:00
Chet Haase
6381a753b6 am 576ca6d9: (-s ours) am 2e150046: Merge "do not merge" into gingerbread
Merge commit '576ca6d9b1a20964b0a432b85321318d87f50d77'

* commit '576ca6d9b1a20964b0a432b85321318d87f50d77':
  do not merge
2010-09-21 10:44:51 -07:00
Makoto Onuki
ea61437cf7 am 0be6c7c5: Merge "DO NOT MERGE: Fix handling IOException in ImapStore" into gingerbread
Merge commit '0be6c7c5cf53d53ecd43f3ea51885c485525ccfb' into gingerbread-plus-aosp

* commit '0be6c7c5cf53d53ecd43f3ea51885c485525ccfb':
  DO NOT MERGE: Fix handling IOException in ImapStore
2010-09-21 10:27:21 -07:00
Makoto Onuki
d7e8135184 am 32517753: Merge "DO NOT MERGE: Handle multiple IMAP SEARCH results." into gingerbread
Merge commit '32517753ea61b12b0971329f375fdd304d12d003' into gingerbread-plus-aosp

* commit '32517753ea61b12b0971329f375fdd304d12d003':
  DO NOT MERGE: Handle multiple IMAP SEARCH results.
2010-09-21 10:27:19 -07:00
Makoto Onuki
7bc1cee278 am 75c6a611: Merge "DO NOT MERGE: Test for interaction between ImapStore and vendor policy." into gingerbread
Merge commit '75c6a611aa9a35a5d938ced3674e559bf47a1ddf' into gingerbread-plus-aosp

* commit '75c6a611aa9a35a5d938ced3674e559bf47a1ddf':
  DO NOT MERGE: Test for interaction between ImapStore and vendor policy.
2010-09-21 10:27:17 -07:00
Makoto Onuki
1251fd2ef3 am 7fbdc44c: Merge "DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it." into gingerbread
Merge commit '7fbdc44c580aa146cec1b91d60bf38e0df641c12' into gingerbread-plus-aosp

* commit '7fbdc44c580aa146cec1b91d60bf38e0df641c12':
  DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it.
2010-09-21 10:27:14 -07:00
Makoto Onuki
d693bda052 am 2ef9710e: Merge "DO NOT MERGE: Implement destroy() for all ImapElement classes." into gingerbread
Merge commit '2ef9710e0226aff64ad2772a511a57e9d6fe05ea' into gingerbread-plus-aosp

* commit '2ef9710e0226aff64ad2772a511a57e9d6fe05ea':
  DO NOT MERGE: Implement destroy() for all ImapElement classes.
2010-09-21 10:27:11 -07:00
Makoto Onuki
e447261c6a am 56d04724: Merge "DO NOT MERGE: Always destroy ImapResponses." into gingerbread
Merge commit '56d04724fe50562653ccd967db6268580e826352' into gingerbread-plus-aosp

* commit '56d04724fe50562653ccd967db6268580e826352':
  DO NOT MERGE: Always destroy ImapResponses.
2010-09-21 10:26:57 -07:00
Makoto Onuki
35a4deb6a0 am 8c02a817: Merge "DO NOT MERGE: Add TODOs to ImapStore." into gingerbread
Merge commit '8c02a81722b23bb31f05f4753d6b044ced74c62c' into gingerbread-plus-aosp

* commit '8c02a81722b23bb31f05f4753d6b044ced74c62c':
  DO NOT MERGE: Add TODOs to ImapStore.
2010-09-21 10:26:53 -07:00
Makoto Onuki
c24a42b5d8 am 415b27fb: Merge "DO NOT MERGE: Follow-up to the new IMAP parser." into gingerbread
Merge commit '415b27fbd3ef02d8a71b99b5f2ec0922a22c00f1' into gingerbread-plus-aosp

* commit '415b27fbd3ef02d8a71b99b5f2ec0922a22c00f1':
  DO NOT MERGE: Follow-up to the new IMAP parser.
2010-09-21 10:26:49 -07:00
Makoto Onuki
0be6c7c5cf Merge "DO NOT MERGE: Fix handling IOException in ImapStore" into gingerbread 2010-09-21 10:24:48 -07:00
Makoto Onuki
32517753ea Merge "DO NOT MERGE: Handle multiple IMAP SEARCH results." into gingerbread 2010-09-21 10:24:44 -07:00
Makoto Onuki
75c6a611aa Merge "DO NOT MERGE: Test for interaction between ImapStore and vendor policy." into gingerbread 2010-09-21 10:24:40 -07:00
Makoto Onuki
7fbdc44c58 Merge "DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it." into gingerbread 2010-09-21 10:24:36 -07:00