Commit Graph

4249 Commits

Author SHA1 Message Date
Marc Blank
de196ca3da When syncing folders, read all data first, then process
Bug: 3353035

Change-Id: I80212b225eae48d0351f47f0d601f77578d2fc96
2011-01-14 17:58:15 -08:00
Todd Kennedy
5134b1ee80 am c890a4e4: Display dialog if unsaved settings would be lost
* commit 'c890a4e4a2cbb489aea4847cf25368a723586530':
  Display dialog if unsaved settings would be lost
2011-01-14 16:12:03 -08:00
Todd Kennedy
c890a4e4a2 Display dialog if unsaved settings would be lost
When navigating away from a preferences screen and unsaved settings would be
lost, display a confirmation dialog. The user can either accept or cancel the
action. If canceling, the user is returned to the settings screen they were
currently on. Otherwise, they are taken to a new fragment (the exact
destination depends upon whether the user navigated "back" or selected another
header)

There is one additional change that needs to be made. In the case of navigating
to another header, we are notified _after_ the new header is selected. In this
scenario, the action is not cancelable and the user will lose any changes. We
must display an appropriate message when this happens. [note: this is the same
behaviour as when the user selects a breadcrumb]

bug 3327737

Change-Id: I4bd3b393a6323f3e63510e3ed08e4e1e745b04c4
2011-01-14 16:09:09 -08:00
Makoto Onuki
9d91b7ca04 Hide the entire tab section if no tabs are visible.
Bug 3342441

Change-Id: I116baffdaa6bc18f00311aef2a0ee726288b19f0
2011-01-14 14:53:03 -08:00
Makoto Onuki
36f2088408 Fix LocalStoreUnitTests
The problem was that we tried to upgrade the db by re-creating a LocalStore,
without closing the existing connection.  The db was still upgraded on the
filesystem, but the old connection kept looking at the old table definition
for whatever reason.

Also cleaned up checkAllTablesFound().  It now shows what columns are
missing when failed.

Bug 3349973

Change-Id: I80f4c67f1bd61cd5e1f12a632978b36a6e0a3b19
2011-01-14 14:36:01 -08:00
Makoto Onuki
31d263d38c Fix UtilityMediumTests
Bug 3353967

Change-Id: I7cdac5f6d4f3008c7ceaf9a8f0520524c9ea16f5
2011-01-14 13:04:19 -08:00
Eric Fischer
3ae09c2a39 am fd1b9def: Merge "Update large screen translations." into honeycomb
* commit 'fd1b9def4c8d815154347377fc9593327f068384':
  Update large screen translations.
2011-01-14 12:59:29 -08:00
Eric Fischer
fd1b9def4c Merge "Update large screen translations." into honeycomb 2011-01-14 12:56:46 -08:00
Makoto Onuki
91551ae19b am 36cc9c18: Fix NPE in AttachmentDownloadServiceTests.testDownloadSet
* commit '36cc9c18edb7ee897d0d758788b6e338cb2ef126':
  Fix NPE in AttachmentDownloadServiceTests.testDownloadSet
2011-01-14 12:01:11 -08:00
Makoto Onuki
36cc9c18ed Fix NPE in AttachmentDownloadServiceTests.testDownloadSet
Bug 3353834

Change-Id: I5cf475ff174bffce80a435c80b1fd85c0be146e9
2011-01-14 11:47:26 -08:00
Eric Fischer
9693caa4da Update large screen translations.
Change-Id: I5cefc468f6505d052c75245b3becdc4ec39d9ad9
2011-01-14 11:02:00 -08:00
Marc Blank
23a38348e0 am 96497dc6: Merge "Support encryption in EAS provisioning" into honeycomb
* commit '96497dc60e165b301a6270dadb27c1e69e250c3c':
  Support encryption in EAS provisioning
2011-01-13 16:53:29 -08:00
Marc Blank
96497dc60e Merge "Support encryption in EAS provisioning" into honeycomb 2011-01-13 16:51:51 -08:00
Makoto Onuki
15be4da2d9 am 1daf8766: Fix NPE in Controller.deleteMessageSync
* commit '1daf8766937e0d8dda6a35870b3e27435c92df9a':
  Fix NPE in Controller.deleteMessageSync
2011-01-13 16:36:25 -08:00
Marc Blank
4fa12e52fc Support encryption in EAS provisioning
* Confirmed that policies enforcing encryption are rejected as
  unsupported (since full encryption plumbing is not in place)

Bug: 334652

Change-Id: I82340cfbd68a9663714a98824a5d8395f2c0da74
2011-01-13 16:26:53 -08:00
Makoto Onuki
1daf876693 Fix NPE in Controller.deleteMessageSync
Bug 3351148

Change-Id: I0015c84e5758504a66a4373668afea063f5b2e15
2011-01-13 16:09:21 -08:00
Makoto Onuki
43e3f4424d am d072f990: Don\'t show trashed messages in Starred mailbox
* commit 'd072f9905d8572f454be1f2ea5d7ba173d2b57d1':
  Don't show trashed messages in Starred mailbox
2011-01-13 16:04:16 -08:00
Makoto Onuki
d072f9905d Don't show trashed messages in Starred mailbox
Also show the *total* starred message count (excluding trashed starred)
in the mailbox list, not *per-account* starred count.

Bug 3346872
Bug 2149412

Change-Id: I2274f215f994b62280ac6138982b927cec22c677
2011-01-13 15:41:22 -08:00
Makoto Onuki
175ec279a4 am 1ec737ce: Merge "Fix NPE in MessageViewFragmentBase" into honeycomb
* commit '1ec737ce284526a19928bd68275fd37d237bf830':
  Fix NPE in MessageViewFragmentBase
2011-01-13 13:53:25 -08:00
Makoto Onuki
1ec737ce28 Merge "Fix NPE in MessageViewFragmentBase" into honeycomb 2011-01-13 13:52:04 -08:00
Makoto Onuki
9799b8fe4b Fix NPE in MessageViewFragmentBase
Add null check for all mMessageContentView accesses.

Also, addressed Andy's comment on I1374b81f; moved the zoom scale array out
of Preferences.

Bug 3350164

Change-Id: I689bd4146ecfffdbb98dccd433ba0c396996df4c
2011-01-13 13:44:44 -08:00
Andy Stadler
f4daf9c214 am 4f721a16: Merge "Add encryption to SecurityPolicy" into honeycomb
* commit '4f721a162521cb4b418d53143a15a29a0ec969cc':
  Add encryption to SecurityPolicy
2011-01-13 13:27:53 -08:00
Andy Stadler
4f721a1625 Merge "Add encryption to SecurityPolicy" into honeycomb 2011-01-13 13:26:13 -08:00
Andy Stadler
469f2987dc Add encryption to SecurityPolicy
* Add encrypted-storage to uses-policies
* Add new field to PolicySet
* Add "false" to all constructor callers
* Add unit tests (including fixing some existing unit tests)
* Add new logic to AccountSecurity activity t0 dispatch both password
  and encryption requests.

Bug: 3346641
Change-Id: I54f39bc9b6fbe21c033a05b36b83081e5c78a296
2011-01-13 13:12:55 -08:00
Makoto Onuki
3fd4546103 am 09cb192d: Merge "Make message view text sizes consistent w/ Gmail" into honeycomb
* commit '09cb192d563429f9e6ef90b9d20c8b8747f75a02':
  Make message view text sizes consistent w/ Gmail
2011-01-13 11:35:10 -08:00
Makoto Onuki
09cb192d56 Merge "Make message view text sizes consistent w/ Gmail" into honeycomb 2011-01-13 11:32:59 -08:00
Marc Blank
24c068b912 Make message view text sizes consistent w/ Gmail
It's exactly the same as Marc's I1240f263, except how it sets the zoom scale.
Seems like WebView.setInitialScale() works...

Bug: 3215606
Change-Id: I1374b81fd7799faa261ba6a06df18f6a8ef9d122
2011-01-13 11:21:26 -08:00
Eric Fischer
ff89285df0 am 61368e61: Merge "Import revised translations." into honeycomb
* commit '61368e6112aa945aaa39cf98f45103e664e74c26':
  Import revised translations.
2011-01-13 11:03:29 -08:00
Eric Fischer
61368e6112 Merge "Import revised translations." into honeycomb 2011-01-13 10:58:53 -08:00
Makoto Onuki
b0cd0edabd am ffdb8a7e: Merge "Fix "load more messages"" into honeycomb
* commit 'ffdb8a7ea9f2bf46d7e6a611fdaf3ebf9dd95d6a':
  Fix "load more messages"
2011-01-13 10:45:00 -08:00
Makoto Onuki
ffdb8a7ea9 Merge "Fix "load more messages"" into honeycomb 2011-01-13 10:43:03 -08:00
Makoto Onuki
0603c07a6f am c22eef71: Merge "Add missing CHAR LIMITs" into honeycomb
* commit 'c22eef71cb7ccc025f2bb1a124b9f632afda41dd':
  Add missing CHAR LIMITs
2011-01-13 10:28:08 -08:00
Andy Stadler
6ba2ffc9d4 am 3903bd3a: Merge "Make breadcrumbs work in server settings fragments" into honeycomb
* commit '3903bd3a64c4b1a31c2b9c2ca5d35b71b2313ac0':
  Make breadcrumbs work in server settings fragments
2011-01-13 10:24:41 -08:00
Makoto Onuki
c22eef71cb Merge "Add missing CHAR LIMITs" into honeycomb 2011-01-13 10:24:01 -08:00
Makoto Onuki
b3b7f01d66 Add missing CHAR LIMITs
Bug 2953798

Change-Id: I3beb4092ce8b8cfb4c445041d617177e080da93f
2011-01-13 10:21:51 -08:00
Marc Blank
fedbf8bacb am 81b6edc3: Merge "Properly clean up after an EAS email wipe" into honeycomb
* commit '81b6edc311f06e292cef6df7d0418e928db15ee2':
  Properly clean up after an EAS email wipe
2011-01-13 10:19:44 -08:00
Andy Stadler
3903bd3a64 Merge "Make breadcrumbs work in server settings fragments" into honeycomb 2011-01-13 10:16:37 -08:00
Marc Blank
81b6edc311 Merge "Properly clean up after an EAS email wipe" into honeycomb 2011-01-13 09:48:42 -08:00
Andy Stadler
983e1ad53b Make breadcrumbs work in server settings fragments
* Switch to newer startPreferenceActivity API
* Newer API lets us pass a string for the breadcrumb
* Get rid of newInstance() calls in all three server settings fragments

Bug: 3188951
Change-Id: I86ae91d63ff7bd32fa0eab96ac18686bb5e3e313
2011-01-13 00:07:09 -08:00
Marc Blank
d9189d346e am ee5780f7: Merge "Properly handle style (and similar) tags in HTML snippets" into honeycomb
* commit 'ee5780f79a6f83ad52cc7f049c9857324ddfe3ff':
  Properly handle style (and similar) tags in HTML snippets
2011-01-12 18:46:07 -08:00
Marc Blank
ee5780f79a Merge "Properly handle style (and similar) tags in HTML snippets" into honeycomb 2011-01-12 18:43:58 -08:00
Makoto Onuki
a796fbab02 Fix "load more messages"
Was simply broken.

Bug 3347062

Change-Id: Ic8d16be377ee5a9871f0019a0b008a4de2390f15
2011-01-12 17:47:26 -08:00
Marc Blank
48eee23376 Properly clean up after an EAS email wipe
* Clear the fetch request list
* Also, make sure we don't try to send local changes during an
  initial sync

Bug: 3347078
Change-Id: Idba7bceb5919bea81bf5b48a69cd4331946505fe
2011-01-12 17:22:40 -08:00
Eric Fischer
17a1576d0b Import revised translations.
Change-Id: I30182d1b3ddf2b87ad4954ee98931fe954831b76
2011-01-12 17:04:03 -08:00
Marc Blank
dad8438593 am 609e47cc: Merge "Cleanup WidgetProvider" into honeycomb
* commit '609e47cc8e660d965b5d91a6da3e52e6989a3463':
  Cleanup WidgetProvider
2011-01-12 16:26:32 -08:00
Marc Blank
609e47cc8e Merge "Cleanup WidgetProvider" into honeycomb 2011-01-12 16:22:46 -08:00
Marc Blank
5a8be8e7ed Properly handle style (and similar) tags in HTML snippets
Bug: 3285281
Change-Id: Ia45dbe39b47f1bcb647efbf1860ed4b933976df8
2011-01-12 16:21:01 -08:00
Marc Blank
055dd6be86 Cleanup WidgetProvider
* Remove STOPSHIPs
* Don't use startService calls

Bug: 3341494
Bug: 3342662
Change-Id: I46fd60db40cf3476255f1af795da0b2a4bc34a7e
2011-01-12 16:12:07 -08:00
Todd Kennedy
2208532e22 am 4c06c82b: Hide view/save buttons if attachment is unviewable
* commit '4c06c82b379d7b14263a456701fb9c45751cd5b2':
  Hide view/save buttons if attachment is unviewable
2011-01-12 15:16:55 -08:00
Todd Kennedy
4c06c82b37 Hide view/save buttons if attachment is unviewable
If none of the installed activities can handle the attachment type, don't let
the user view or save the attachment to the device.

bug 3338984

Change-Id: I6c158b7dd11ec48eec81f9a96289dd2c914f6a2c
2011-01-12 14:55:31 -08:00