Andy Stadler
8ab60f362a
am b89d6179
: am 999199d4
: Merge "Remove STOPSHIPs and a bit of debug logging" into honeycomb
...
* commit 'b89d6179a2e682f6fc51da8bcbe06c82492a4c05':
Remove STOPSHIPs and a bit of debug logging
2011-01-26 23:03:03 -08:00
Andy Stadler
b89d6179a2
am 999199d4
: Merge "Remove STOPSHIPs and a bit of debug logging" into honeycomb
...
* commit '999199d49a23b4d88efb8619c3538fede6149e23':
Remove STOPSHIPs and a bit of debug logging
2011-01-26 23:00:59 -08:00
Andy Stadler
97691069df
am d414f151
: am 1fc9b6b5
: Merge "Add "tap to configure" text to widget" into honeycomb
...
* commit 'd414f151395fb895f939019495751f719ec222b0':
Add "tap to configure" text to widget
2011-01-26 23:00:57 -08:00
Andy Stadler
d414f15139
am 1fc9b6b5
: Merge "Add "tap to configure" text to widget" into honeycomb
...
* commit '1fc9b6b5c3b8b3212fe9146fbe10f046503124e4':
Add "tap to configure" text to widget
2011-01-26 22:59:01 -08:00
Andy Stadler
999199d49a
Merge "Remove STOPSHIPs and a bit of debug logging" into honeycomb
2011-01-26 22:58:22 -08:00
Andy Stadler
1fc9b6b5c3
Merge "Add "tap to configure" text to widget" into honeycomb
2011-01-26 22:57:09 -08:00
Andy Stadler
c540b57263
Remove STOPSHIPs and a bit of debug logging
...
Bug: 3396875
Change-Id: I3e874e28c3412aadd9851000a83d69fc8c06aeb9
2011-01-26 22:53:08 -08:00
Andy Stadler
219ca40905
am 230a5d1f
: am 1758bc3c
: Merge "Remove STOPSHIPs." into honeycomb
...
* commit '230a5d1f045e0de321de64effa5b2aa87c92cf76':
Remove STOPSHIPs.
2011-01-26 21:52:04 -08:00
Andy Stadler
230a5d1f04
am 1758bc3c
: Merge "Remove STOPSHIPs." into honeycomb
...
* commit '1758bc3c851bac5e6e55548ad0da3d66a90446b4':
Remove STOPSHIPs.
2011-01-26 21:49:29 -08:00
Andy Stadler
1758bc3c85
Merge "Remove STOPSHIPs." into honeycomb
2011-01-26 21:47:12 -08:00
Marc Blank
7761952c7a
am 751c5da7
: am 610bbaee
: Merge "Fix NPE in SecurityPolicy.policiesRequired" into honeycomb
...
* commit '751c5da774bdcb0d376743ee31a4200d78f56cae':
Fix NPE in SecurityPolicy.policiesRequired
2011-01-26 21:44:25 -08:00
Marc Blank
751c5da774
am 610bbaee
: Merge "Fix NPE in SecurityPolicy.policiesRequired" into honeycomb
...
* commit '610bbaee422b8638724bf98c6cecbf3035b018ad':
Fix NPE in SecurityPolicy.policiesRequired
2011-01-26 21:41:55 -08:00
Marc Blank
610bbaee42
Merge "Fix NPE in SecurityPolicy.policiesRequired" into honeycomb
2011-01-26 21:39:47 -08:00
Todd Kennedy
6025bcd18a
am be372f8b
: am a7f49a7c
: Update icons with latest drop from UI
...
* commit 'be372f8bde323ce402a7a6094e2ba7b6a7aba186':
Update icons with latest drop from UI
2011-01-26 19:11:27 -08:00
Dianne Hackborn
466f9b84ea
am 0ca9fa44
: (-s ours) am b672234a
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '0ca9fa44245dc0a9b93b189a15a1134a9bfef8ac':
Import revised translations. DO NOT MERGE
2011-01-26 19:11:25 -08:00
Makoto Onuki
3f7c86301a
am 7ce9ab76
: am 199a0601
: Merge "Fix bug where mailbox list won\'t update in combined view" into honeycomb
...
* commit '7ce9ab76382a47201e881c0a5f46120c42a26291':
Fix bug where mailbox list won't update in combined view
2011-01-26 19:09:27 -08:00
Andy Stadler
d1144b9558
am c87b622e
: am 38247854
: Merge "Protect against threading issues in AttachmentDownloadService" into honeycomb
...
* commit 'c87b622e567291b3dc50c42b4f75e2782df4db94':
Protect against threading issues in AttachmentDownloadService
2011-01-26 19:07:03 -08:00
Marc Blank
844b14f851
Fix NPE in SecurityPolicy.policiesRequired
...
* Add check for null Account, as this method can be called from a
background thread, and the Account might have been deleted by the
time we're called
Bug: 3396365
Change-Id: Ie125ed714c73d51beaedc818b6b731cea941666f
2011-01-26 18:18:45 -08:00
Makoto Onuki
eee1139ba6
Remove STOPSHIPs.
...
Bug 3396430
Change-Id: I31fe78793fbb92712b7077219178df68f5d0aa3d
2011-01-26 18:15:51 -08:00
Todd Kennedy
be372f8bde
am a7f49a7c
: Update icons with latest drop from UI
...
* commit 'a7f49a7c0b4a67b4dc7d306a646a5b1e15a808c8':
Update icons with latest drop from UI
2011-01-26 18:03:49 -08:00
Dianne Hackborn
0ca9fa4424
am b672234a
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b672234a0d6772324947bafb6dc2c4e79caa593f':
Import revised translations. DO NOT MERGE
2011-01-26 18:02:55 -08:00
Todd Kennedy
6c5ee59c4f
Add "tap to configure" text to widget
...
If there are no email accounts defined, the widget should show a single string
that allows the user to create a new account. Whenever there are changes to
the defined accounts, the widget(s) will update their headers to ensure they
are only displaying valid information.
bug 3296594
Change-Id: I156c20cfc90692174297a2aededd85775e0ea196
2011-01-26 17:58:51 -08:00
Todd Kennedy
a7f49a7c0b
Update icons with latest drop from UI
...
Change-Id: Ic23f1bee28c8aef1974225f9c03edc92c845f8c7
2011-01-26 17:43:03 -08:00
Dianne Hackborn
b672234a0d
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-26 17:37:32 -08:00
Makoto Onuki
7ce9ab7638
am 199a0601
: Merge "Fix bug where mailbox list won\'t update in combined view" into honeycomb
...
* commit '199a0601aef47fed41ee05e2bcf414fc1001ab2a':
Fix bug where mailbox list won't update in combined view
2011-01-26 17:34:16 -08:00
Makoto Onuki
199a0601ae
Merge "Fix bug where mailbox list won't update in combined view" into honeycomb
2011-01-26 17:31:51 -08:00
Eric Fischer
5d0a9b5dd7
Import revised translations. DO NOT MERGE
...
Change-Id: Iaa2876f8671e7a8ede38a076f39260a8be457f72
2011-01-26 16:34:09 -08:00
Andy Stadler
c87b622e56
am 38247854
: Merge "Protect against threading issues in AttachmentDownloadService" into honeycomb
...
* commit '382478547eaf3e7300d79ff45518a99ad60ca53d':
Protect against threading issues in AttachmentDownloadService
2011-01-26 16:08:54 -08:00
Andy Stadler
382478547e
Merge "Protect against threading issues in AttachmentDownloadService" into honeycomb
2011-01-26 16:06:54 -08:00
Marc Blank
ed9938cd9c
Protect against threading issues in AttachmentDownloadService
...
Bug: 3391148
Change-Id: I513b5678815db262ea5660661336432f1e203c9e
2011-01-26 16:04:28 -08:00
Makoto Onuki
3e602786ee
am e606493f
: am 3fd2513a
: Merge "Make the "refreshing" progress icon smaller" into honeycomb
...
* commit 'e606493fb8b749bf1dc00adf757244875a106315':
Make the "refreshing" progress icon smaller
2011-01-26 15:09:07 -08:00
Makoto Onuki
26a7a7ffe5
am 1d4935ca
: am 3735cd42
: Merge "Make account name on action bar narrower" into honeycomb
...
* commit '1d4935ca3201fff4e7b9824d782f4bd8d8be4251':
Make account name on action bar narrower
2011-01-26 15:06:52 -08:00
Makoto Onuki
e606493fb8
am 3fd2513a
: Merge "Make the "refreshing" progress icon smaller" into honeycomb
...
* commit '3fd2513a18938d88d61d1af8f05e00cd2a8e2a38':
Make the "refreshing" progress icon smaller
2011-01-26 15:05:43 -08:00
Makoto Onuki
1d4935ca32
am 3735cd42
: Merge "Make account name on action bar narrower" into honeycomb
...
* commit '3735cd4256331a93fb3971b2359a8978ba2b3995':
Make account name on action bar narrower
2011-01-26 15:03:32 -08:00
Makoto Onuki
3fd2513a18
Merge "Make the "refreshing" progress icon smaller" into honeycomb
2011-01-26 15:02:19 -08:00
Makoto Onuki
3735cd4256
Merge "Make account name on action bar narrower" into honeycomb
2011-01-26 15:01:10 -08:00
Makoto Onuki
75ebb59c71
Make the "refreshing" progress icon smaller
...
Bug 3388138
Change-Id: I0c329de5c2d2e39f34262df15363399ed2fd99e8
2011-01-26 13:49:11 -08:00
Makoto Onuki
d0ee1e404d
Fix bug where mailbox list won't update in combined view
...
The problem was that CombinedMailboxesLoader used the cursor returned by
super.loadInBackground() (which contains accounts), to build a matrix
cursor (which contains special mailboxes and accounts and will be returned),
and *it closed the first cursor* after building the matrix cursor.
However, because this first cursor is the one that CursorLoader sets an
observer, it shouldn't be closed until the returned matix cursor closes.
In other words the two cursors should have the same lifecycle.
Fixed it by using ClosingMatrixCursor that used by AccountsLoader, which
is doing a similar thing, but properly.
Bug 3387730
Change-Id: I554ade001dc25afa869eefb4dcf9887495e6753e
2011-01-26 13:40:53 -08:00
Makoto Onuki
3af94be477
Make account name on action bar narrower
...
... to give the mailbox name more space. Otherwise it can be too
small in portrait.
Bug 3387730
Change-Id: I0301fd696dc2c4dfa3654a235b9e95aa7db4b885
2011-01-26 13:26:14 -08:00
Andy Stadler
d87284f62e
am 1ad9f4c8
: am f0209104
: Fix Account Manager integration
...
* commit '1ad9f4c86287f7280cf0e57fd0405a1c7c000e5b':
Fix Account Manager integration
2011-01-26 11:55:07 -08:00
Andy Stadler
1ad9f4c862
am f0209104
: Fix Account Manager integration
...
* commit 'f020910461908681978a9e0f8f98b748853b0e39':
Fix Account Manager integration
2011-01-26 11:53:08 -08:00
Andy Stadler
f020910461
Fix Account Manager integration
...
* Rework the interaction with the Account Manager
* Remove unneeded call to response.onRequestContinued()
* Store response in SetupData so it can survive the entire account
setup flow.
* Explicitly report exit status to acct mgr at known exit points:
* AccountSetupBasics.finish() (fail/cancel)
* AccountSetupOptions.finish() (fail/cancel)
* AccountSetupOptions.optionsComplete() (success)
Bug: 3335128
Change-Id: Ia55724eb1e938f2633c5ff7afb719a879be16a1b
2011-01-26 11:16:56 -08:00
Justin Ho
bf85c26ff2
am a8c9dcd0
: am b0c06733
: Merge "New stat_notify icons for Email" into honeycomb
...
* commit 'a8c9dcd00571e6d585ea1cb4353ea89f564f8cdc':
New stat_notify icons for Email
2011-01-26 08:52:52 -08:00
Justin Ho
a8c9dcd005
am b0c06733
: Merge "New stat_notify icons for Email" into honeycomb
...
* commit 'b0c0673342243ee1e66fee1045a7ddf7b7638aee':
New stat_notify icons for Email
2011-01-26 08:50:21 -08:00
Justin Ho
b0c0673342
Merge "New stat_notify icons for Email" into honeycomb
2011-01-26 08:47:52 -08:00
Andy Stadler
4a3f86a820
am 8d5f5cfd
: am a97faa25
: Discard result of Dupe Account check if paused
...
* commit '8d5f5cfd56a2d35da9d2000cd278c21bc73cccb6':
Discard result of Dupe Account check if paused
2011-01-26 08:34:01 -08:00
Andy Stadler
8d5f5cfd56
am a97faa25
: Discard result of Dupe Account check if paused
...
* commit 'a97faa25ac3265209b50d4534b4c2b41cd211e5c':
Discard result of Dupe Account check if paused
2011-01-26 08:29:47 -08:00
Justin Ho
f81e133d7a
New stat_notify icons for Email
...
Change-Id: I9308a4c526f6a726b05aa6be08bdbab540c16d8d
2011-01-26 07:59:03 -08:00
Andy Stadler
a97faa25ac
Discard result of Dupe Account check if paused
...
Fixes a potential race condition with a slow DB lookup and a
fast user (or monkey).
Bug: 3384992
Change-Id: I0602820e1d9f49eb01b09c9d78db3d0fc47ccfb1
2011-01-25 23:18:45 -08:00
Makoto Onuki
fb0b3554cb
am 5b0d170e
: am da758716
: Merge "Make the refresh button animate in-place." into honeycomb
...
* commit '5b0d170e45c0c03cf85e528707a4b11af17d978a':
Make the refresh button animate in-place.
2011-01-25 21:45:28 -08:00