Commit Graph

5617 Commits

Author SHA1 Message Date
Marc Blank
28b48acab0 resolved conflicts for merge of 7c270c50 to master
Change-Id: Id1694449a8a270429cf32b2ecd70da7afa3447a1
2011-05-25 09:34:37 -07:00
Todd Kennedy
d7db0a5f6b Merge "Auto-select if only one item in the list" 2011-05-25 08:43:04 -07:00
Marc Blank
f3ff0ba910 Create AccountManager acct for pop/imap on upgrade from GB
* Also, unit test for upgrade path

Bug: 4439595
Change-Id: I508a3d8ea70c1a894a412528314e42a39f3ae0e7
2011-05-25 08:31:24 -07:00
Todd Kennedy
e2d227ffed Auto-select if only one item in the list
If there is only one account and/or mailbox, automatically select it and
move onto the next step.

Change-Id: I716fbafb50ac6d59a17739a8d69c735d7733858b
2011-05-24 16:04:09 -07:00
Todd Kennedy
5675ea88d3 Add a second fragment to select the mailbox
After choosing the account, we need to select a mailbox for the shortcut.
In order to replace the fragment, we cannot hardcode it in the XML. Instead,
we need to dynamically create it.

Also, restructure the fragment class and rely on the class to "do the right
thing"

Change-Id: I752ad5bbdf2484332ec2b73852cae74a5d2092fa
2011-05-24 16:00:33 -07:00
Makoto Onuki
0b31917c0e Rename some MessageViewFragmentBase callbacks.
- Renamed some methods in MessageViewFragmentBase.Callback
- Removed unnecessary argument from a callback.
- Removed obsolete comment.

Change-Id: Ia5af222971bfe6b943c98208b539946f14f16aa8
2011-05-24 14:00:24 -07:00
Marc Blank
7c270c50ef am 4f5d4e29: Always set policies in DPM before checking whether they are active
* commit '4f5d4e29a8180b5c1e8cd80f5e3e9c4ed098049c':
  Always set policies in DPM before checking whether they are active
2011-05-24 13:12:30 -07:00
Todd Kennedy
e4a4eb66b1 Merge "Only use one line of text for the shortcut list" 2011-05-24 11:45:10 -07:00
Ben Komalo
8408621659 Merge "Simple change to use the new split action bar." 2011-05-24 11:17:07 -07:00
Todd Kennedy
87f9b376a8 Only use one line of text for the shortcut list
The list used to contain both the display name (whatever special name the user
chose during account creation) and the email address. The new mocks only use
the display name.

Change-Id: I97f4f16af9865207f26e67aed5d07340775ea37c
2011-05-24 09:23:43 -07:00
Todd Kennedy
1e3c6d9788 use a fragment for the shortcut picker
instead of using an activity (which will be hard to manage multiple screens in
the 'back' stack), use a fragment. we can easily manage multiple fragments with
a fragment transaction.

Change-Id: Ibf75dd45941a0c1c6b6b6add8de78146cdae7c65
2011-05-24 07:35:22 -07:00
Ben Komalo
87df8d7161 Simple change to use the new split action bar.
Change-Id: I51456822bdf1c6f75aeb0ced615e44b624b26460
2011-05-23 20:41:24 -07:00
Marc Blank
4f5d4e29a8 Always set policies in DPM before checking whether they are active
* Since DPM can erroneously report a password failure (specifically,
  isActivePasswordSufficient() can return false when, in fact, the
  active password is just fine)
* This is the proximate cause of the referenced bug; we just weren't
  prepared to have the DPM mislead us...

Bug: 4464610
Change-Id: Ifcb85c0729e9a1884fbcf7b4180eb332bbfef1b5
2011-05-23 16:48:14 -07:00
Ben Komalo
f872876699 DO NOT MERGE - Fix some issues with 7" layouts.
- Use new recommended sw600dp instead of w600dp to avoid having the
"personality" change on configuration change
- remove the use of xlarge/large for specializing values since the
framework team discourages any use of the buckets (and have also changed
the ordering so that they take lower priority)

Change-Id: Ia6943af9207471b801ce79435ffe9d730b6786b7
2011-05-20 19:08:13 -07:00
The Android Open Source Project
450db23c1c Reconcile with gingerbread-release honeycomb-release
Change-Id: Idc6e788621e2e3e809058e65f548935a176170e9
2011-05-20 13:58:38 -07:00
Ben Komalo
ee97468feb Fix typo in settings.
This was causing a crash in settings when opening an incoming settings
fragment after initial setup.

Change-Id: Icedd24a3f5e8f378d6725a09c97525450ef74af7
2011-05-20 11:52:13 -07:00
Makoto Onuki
c5bbf134ea Merge "Show a toast for stale shortcuts." 2011-05-19 16:32:25 -07:00
Ben Komalo
b535e436f3 Merge "Move HostAuth to top level class." 2011-05-19 16:28:18 -07:00
Makoto Onuki
c1ca222b75 Show a toast for stale shortcuts.
Change-Id: Ibd7b9ae6a39169604136faafc1a7f87876ba55a1
2011-05-19 16:24:47 -07:00
Ben Komalo
12b82d9374 Move HostAuth to top level class.
No other changes made.

Change-Id: I1c6497c98abc0f99443ea42d8aed6295b263c123
2011-05-19 15:28:48 -07:00
Makoto Onuki
d531dc3058 Fix opening Starred mailbox.
We need to pass around the account ID with onMailboxSelected too.
(It's kinda sad it wouldn't have happened if we had par-account starred
mailbox.)

Also made sure MailboxListItem.mMailboxId now really contains only a mailbox
ID.  Before this chage, we stored an account ID to this for an account row
on the combined mailbox.

Bug 4452811

Change-Id: I732fd8eb18f787f4a700a45a40768f96e3bb8751
2011-05-19 15:10:51 -07:00
Makoto Onuki
2ed7a86949 Support pre-HC style account shortcuts
Account shortcuts used to point at MessageList directly with a
content://com.android.email.provider/account/ACCOUNT-UUID URI.

Hook these intents and open Welcome instead.

On Eclair and before, we stored an account-ID directly as an extra,
but this style is no longer supported.

Bug 4208879

Change-Id: I9fecb0723743377a6d7c7e84626e8613f2356492
2011-05-19 13:47:25 -07:00
Marc Blank
182caacd47 am 89fe584f: (-s ours) am 5d9f9a41: (-s ours) am f39645cc: DO NOT MERGE: Work around framework bug related to service start
* commit '89fe584fbf1376d82db4daa0f427b085b2204bfb':
  DO NOT MERGE: Work around framework bug related to service start
2011-05-19 11:11:35 -07:00
Marc Blank
89fe584fbf am 5d9f9a41: (-s ours) am f39645cc: DO NOT MERGE: Work around framework bug related to service start
* commit '5d9f9a41b27442238de36c41f30945af9dfcdc36':
  DO NOT MERGE: Work around framework bug related to service start
2011-05-19 11:04:56 -07:00
Makoto Onuki
973c3402d0 Merge "Change to Mailbox/MessageListFragment" 2011-05-19 11:03:19 -07:00
Marc Blank
5d9f9a41b2 am f39645cc: DO NOT MERGE: Work around framework bug related to service start
* commit 'f39645ccef07a272d42b902c1558c5067ca249c3':
  DO NOT MERGE: Work around framework bug related to service start
2011-05-19 10:56:07 -07:00
Makoto Onuki
01bd33f318 Change to Mailbox/MessageListFragment
- MailboxListFragment.Callback.onMailboxSelected is now split into
  two different callbacks, one for regular selection and the
  other for DnD for clarity.
- Added onDragStarted/Ended to MessageListFragment.Callback
- Changed Log to use this

Change-Id: I8861d3b43aa1b5b17c68c53605270e99733599f4
2011-05-19 10:51:12 -07:00
Marc Blank
f39645ccef DO NOT MERGE: Work around framework bug related to service start
Bug: 4450201
Change-Id: Id49fc4859726600b63a63897966860bc8dc57cda
2011-05-19 10:26:58 -07:00
Ben Komalo
b1c5c75abe am 74cf6fdd: (-s ours) am faaf1e60: Merge "DO NOT MERGE - Email support for 7" devices." into honeycomb-mr2
* commit '74cf6fdd0d8f188ae277f04bb9fa7652a3b24574':
  DO NOT MERGE - Email support for 7" devices.
2011-05-19 08:58:39 -07:00
Ben Komalo
74cf6fdd0d am faaf1e60: Merge "DO NOT MERGE - Email support for 7" devices." into honeycomb-mr2
* commit 'faaf1e60f866dc8dce6267d8e2645aab2fd29f06':
  DO NOT MERGE - Email support for 7" devices.
2011-05-18 18:12:46 -07:00
Ben Komalo
faaf1e60f8 Merge "DO NOT MERGE - Email support for 7" devices." into honeycomb-mr2 2011-05-18 18:08:56 -07:00
Makoto Onuki
92c0d91578 Merge "Clean up Two pane" 2011-05-18 15:14:50 -07:00
Makoto Onuki
49de71e3d2 Clean up Two pane
- Remove bunch of outdated TODOs
- Removed the stack for the back navigation for nested folders.
  Instead, Back/Up will always just navigate to the parent mailbox.
- Two-pane UI controller no longer stores IDs by itself.
  Now it always gets these from installed fragments.
- Added UIController.switchAccount(), which is the same as openAccount
  except it's no-op if the account is already selected.
- Other small clean-ups.

Change-Id: Ie14bc4f4b6b2cf6afb69bc97967c25682d4c7c78
2011-05-18 14:55:44 -07:00
Marc Blank
3f9447a0e1 am b4578815: (-s ours) am 4ad68f6a: (-s ours) am c55e2c88: DO NOT MERGE: Fix serious DST issue with non-DST time zones
* commit 'b4578815e2a287f9d975b8beef1e1546db0e5961':
  DO NOT MERGE: Fix serious DST issue with non-DST time zones
2011-05-18 10:25:06 -07:00
Ben Komalo
9f976e29a0 DO NOT MERGE - Email support for 7" devices.
- use XLarge layout for Large as well in most cases.
- use XLarge portrait behavior for landscape and portrait for message
list collapsing
- some minor tweaks to account setup UI as the XLarge one didn't fit
on large devices with the padding it specified

Change-Id: I2a83e7239019b3feadcabe5fae61f0d13a628471
2011-05-18 10:23:22 -07:00
Todd Kennedy
ff72651145 Clean up shortcut picker
First some cleanup before adding new functionality.

Change-Id: I37339bb8967c2136c8361133d38c2f5ad30ae3e2
2011-05-18 09:59:31 -07:00
Eric Fischer
b212ba8e6b am 4e1a917b: (-s ours) am 9576db71: Import revised translations. DO NOT MERGE
* commit '4e1a917b0ba1e065a82af0720ca3231a0c6aa745':
  Import revised translations.  DO NOT MERGE
2011-05-18 09:21:31 -07:00
Marc Blank
b4578815e2 am 4ad68f6a: (-s ours) am c55e2c88: DO NOT MERGE: Fix serious DST issue with non-DST time zones
* commit '4ad68f6a47f744976801596784c98bdd25ab2df5':
  DO NOT MERGE: Fix serious DST issue with non-DST time zones
2011-05-17 17:51:33 -07:00
Marc Blank
4ad68f6a47 am c55e2c88: DO NOT MERGE: Fix serious DST issue with non-DST time zones
* commit 'c55e2c884743bf5dee7de8d0fda69db3510476fd':
  DO NOT MERGE: Fix serious DST issue with non-DST time zones
2011-05-17 17:46:24 -07:00
Eric Fischer
f0ec26e63e Merge "Import revised translations." 2011-05-17 17:18:40 -07:00
Eric Fischer
8d3c2229bc Import revised translations.
Change-Id: Iad3bda4840f37b7c9c30012ffc657440cc9ac991
2011-05-17 16:59:35 -07:00
Makoto Onuki
3909570d26 Merge "Changes for NO_XXX" 2011-05-17 15:00:42 -07:00
Makoto Onuki
b36ac01792 Changes for NO_XXX
- Added Message.NO_MESSAGE
- Renamed PSEUDO_ACCOUNT_ID_NONE to NO_ACCOUNT
- Removed PARENT_KEY_NONE and use NO_MAILBOX instead
- For starters, cleaned up the UI controllers to use them.

Change-Id: I6cfd87ece2fced8e9f7c76d034c4d1dbf9e4db10
2011-05-17 14:36:00 -07:00
Todd Kennedy
18ad1651fa Merge "Fix display of POP3 mailbox" 2011-05-17 14:35:10 -07:00
Todd Kennedy
e07ecb8864 Fix display of POP3 mailbox
When legacy support for mailboxes with a parent key of '0' was removed, the
parent key for POP3 mailboxes was not updated. This forces the parent key
for all POP3 mailboxes to be "no mailbox". If we ever want to support virtual
mailboxes for POP3 accounts, this will need to be adjusted.

Change-Id: I4ae0e386db4bcdaf559b87ca17cbe0d151dea75b
2011-05-17 14:18:40 -07:00
Marc Blank
a30316d0df Merge "Workaround bug in DPM related to initialization of our admin" 2011-05-17 14:13:59 -07:00
Eric Fischer
4e1a917b0b am 9576db71: Import revised translations. DO NOT MERGE
* commit '9576db716b33ad9d27688daf484d70440f5347a0':
  Import revised translations.  DO NOT MERGE
2011-05-17 13:31:53 -07:00
Marc Blank
6d9d71683a Workaround bug in DPM related to initialization of our admin
Bug: 4436285

Change-Id: If6f0ccaa9e1479fae0dbd1853a462eaf7948ccfc
2011-05-17 13:27:02 -07:00
Eric Fischer
9576db716b Import revised translations. DO NOT MERGE
Change-Id: I015a4828ea6576c553ada0ed6774aaa88be025b5
2011-05-17 13:20:23 -07:00
Todd Kennedy
7bf21c7165 Merge "Fix bug where we fail to acknowledge an APPEND" 2011-05-17 11:07:33 -07:00