Commit Graph

5442 Commits

Author SHA1 Message Date
Todd Kennedy
b59b9d04d5 Merge "Don't navigate to a shortcut mailbox" 2011-05-26 14:56:50 -07:00
Makoto Onuki
3a505d8d96 MessageViewFragment: Preparing to use back stack.
Do all the clean-up stuff in onDestroyView() rather than onDestroy(),
so that no callbacks (such as the controller callbacks and
AsyncTask.onPostExecute()s) will work when it doesn't have views.

Change-Id: Ic4aa771d28209ee7b56ac4d228488768ae998dd8
2011-05-26 14:47:13 -07:00
Todd Kennedy
ca6eca0466 Don't navigate to a shortcut mailbox
All shortcuts now have a mailbox associated with them. When launching
the app via shortcut, we want to show the messages within that mailbox, but,
we do not want to navigate into the mailbox; unless the mailbox has children.
Since we don't want to put too much informatin into the shortcut, we must
perform these checks at runtime. So, if ever we try to load a mailbox that
doesn't contain children, we load it's parent instead.

Change-Id: Idb5dbc7cd740b270a0068811abe685f963ca2c0b
2011-05-26 14:21:42 -07:00
Marc Blank
a04a4924ba am cea300d2: Merge "Revert "Always set policies in DPM before checking whether they are active"" into honeycomb-mr2
* commit 'cea300d2dc04f3c1d8b598c93f25c1f154c3fa29':
  Revert "Always set policies in DPM before checking whether they are active"
2011-05-26 14:14:59 -07:00
Eric Fischer
83300be80c am 965569d5: Import revised translations. DO NOT MERGE
* commit '965569d58d18a8564a81b596e6aebf2ee58e058a':
  Import revised translations.  DO NOT MERGE
2011-05-26 14:14:58 -07:00
Marc Blank
cea300d2dc Merge "Revert "Always set policies in DPM before checking whether they are active"" into honeycomb-mr2 2011-05-26 13:31:10 -07:00
Marc Blank
67fefe21b6 Remove change made to workaround DPM issue
Change-Id: I88a9663d513e13ecca5957c61e2e817a8bd847d5
2011-05-26 12:06:28 -07:00
Marc Blank
7b9a927caa Revert "Always set policies in DPM before checking whether they are active"
* The underlying bug in DPM was fixed by hackbod in
  I4ebe0ea0461222b65425b2c5438b646b572f18c8

This reverts commit 4f5d4e29a8.
2011-05-26 11:24:51 -07:00
Eric Fischer
965569d58d Import revised translations. DO NOT MERGE
Change-Id: I2869bc8ea126ce63f2ac9eb7adb6b28373b519b5
2011-05-26 11:24:26 -07:00
Ben Komalo
fdfeb8d3c3 Prevent NPE in MessageCompose.
New actionBar code makes removeAllTabs() not safe when there are no
tabs.

Change-Id: I9ac09c71872c5f2aaad7b8e3cf5dbe0caac6f8ef
2011-05-26 11:14:05 -07:00
Marc Blank
09a071a879 Don't use multipart/alternative for SmartReply/Forward text
* When confirmed fixed, this should be backported to MR2/MR2

Bug: 4490341
Change-Id: Ie99047b465ed7087e6e0100f7d517ac3fb6b803c
2011-05-26 10:19:01 -07:00
Makoto Onuki
4ade29d6b0 Merge "MailboxListFragment: Preparing to use back stack" 2011-05-26 10:18:14 -07:00
Ben Komalo
d89136e037 am 531f0034: (-s ours) am a40be727: Merge "DO NOT MERGE - Fix some issues with 7" layouts." into honeycomb-mr2
* commit '531f003446910539ca95c1a439f904f2e73dd98a':
  DO NOT MERGE - Fix some issues with 7" layouts.
2011-05-25 21:28:14 -07:00
Marc Blank
40ce9246c6 Merge "Cleanup code in Policy" 2011-05-25 18:52:11 -07:00
Marc Blank
fae5ebbfd2 Cleanup code in Policy
* Use a single method for setting/clearing an account's policy

Change-Id: I90fd97d4a5ba452d4656bbabd06a40797c82e10c
2011-05-25 17:38:12 -07:00
Makoto Onuki
d1b7d43df6 MailboxListFragment: Preparing to use back stack
- Added more lifecycle logs to understand fragment lifecycle better.
- Made sure all code work fine even in the  state where a MailboxListFragment
  is create but doesn't have views.
- Cleaned up list state resoration code.
  Removed the setListAdapter call from onLoadFinished, which lets the
  ListView restore the state by itself, in the case where we're re-loading
  list for DB changes.  We still need to do the restoration manually for
  the orientation change case.

Change-Id: I96bff4ace6d48cc02113c2f5bd6a995260122334
2011-05-25 17:25:44 -07:00
Ben Komalo
51fa1c84b2 Remove an 'xlarge' reference after the 7" split
Change-Id: I9e12dcf28cd69a0859d3d7664e83bf741855ed02
2011-05-25 16:55:31 -07:00
Ben Komalo
529947929c Merge "Step 2 in 7" support for tablets." 2011-05-25 16:54:16 -07:00
Ben Komalo
102a001e96 Merge "Step 1 in - Email support for 7" devices." 2011-05-25 16:43:49 -07:00
Ben Komalo
c1a20e7568 Step 2 in 7" support for tablets.
This is a cherry-pick of f872876699 :
- 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: I645bfb7cddcda8b53569af927f6fa23180e73e1f
2011-05-25 15:44:41 -07:00
Makoto Onuki
3096b4ae18 Add Controller.deleteMessages(long[]) for batch delete
- Also removed the accoundId parameter, which wasn't used.
- Also cleaned up MailboxListFragment.onDrop.
  (the restored Message was only used to get the account id, but
   it's no longer needed.)

Bug 4384642

Change-Id: I8f6635011dae0529a82972617101e1c130090b76
2011-05-25 13:49:40 -07:00
Ben Komalo
761390a041 Step 1 in - Email support for 7" devices.
This is a cherry-pick of 9f976e29a0 from
honeycomb-mr2. This is still using the old w600 qualifiers but the next
CL will cherry-pick the fix for that.

Change-Id: I40ab6717575cdfd02d5f7d05409f0355e96f2085
2011-05-25 12:52:00 -07:00
Makoto Onuki
72b458395d Merge "Rename some MessageViewFragmentBase callbacks." 2011-05-25 10:12:25 -07:00
Ben Komalo
531f003446 am a40be727: Merge "DO NOT MERGE - Fix some issues with 7" layouts." into honeycomb-mr2
* commit 'a40be727bbecfda86c76113f97d271ff07e9df71':
  DO NOT MERGE - Fix some issues with 7" layouts.
2011-05-25 10:01:29 -07:00
Ben Komalo
a40be727bb Merge "DO NOT MERGE - Fix some issues with 7" layouts." into honeycomb-mr2 2011-05-25 09:42:10 -07:00
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