bc47398187c6ffd132435e51d8d61e6ec79a79db |
|
25-Sep-2012 |
Paul Westbrook <pwestbro@google.com> |
Merge Email1 into MR1 Change-Id: I45289d46b65faffc7a3a3dd46382899162f3aaab
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
cc0185f07c9198008d8dc685ae9979f3e35e8539 |
|
28-Jun-2012 |
Marc Blank <mblank@google.com> |
Manual merge of Email from jb-ub-mail Change-Id: I564ddf433d371f45ba78a10f73bb182d484c56f2
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
8466f79a06433bf3d05a770578c72b2b60e1bd7c |
|
26-Aug-2011 |
Ben Komalo <benkomalo@google.com> |
Asset drop. - this syncs up the UX repo with the developer repo so that the assets now match. We should be able to do wholesale drops/diffs from now on. - lots of changes to widget so that it is (mostly) up to spec now, and matches the preview Bug: 5225385 Bug: 5205578 Bug: 4320895 Change-Id: I8ccbadcfc17cdb406599497edc91165809f55d68
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
a6212c88e0fb5906cb4065c775c1f4c0b83b7ca4 |
|
30-Jun-2011 |
Makoto Onuki <omakoto@google.com> |
Fix bug 4978035 Precondition failure: Not combined mailbox Also added test. (For some reason the message count doesn't get set properly on tests... I'll investigate it when I get around to it...) Change-Id: I83f3b6f2079da06b2d4973419d2296e6492de1d3
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
4b39d7ccff82f54f6ac53075de70ac8ded9f4ca1 |
|
29-Jun-2011 |
Makoto Onuki <omakoto@google.com> |
Fix for "Unknown uri: .../mailbox/-4 It was caused by the fact that we show the combined starred mailbox on each account's mailbox list. Beacuse of this, when you open the starred mailbox on non-combined view, we pass a normal account ID + the combined starred mailbox ID to the AccountsLoader, which then thinks that because the account ID is not ACCOUNT_ID_COMBINED_VIEW the mailbox ID must be of a regular mailbox, issues a query to get mailbox info, and crashes because the mailbox is virtual. - Also fixed the issue that we don't show message count on the account spinner for combined mailboxes. bug 4971181 Change-Id: Iaa13b362505b8babc7f7ea8a03ddf5494736dc2d
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
659f60f73428eb7f7b393689d1a74bfddd9a0cc2 |
|
29-Jun-2011 |
Ben Komalo <benkomalo@google.com> |
Wire through logic for searched mailbox - update hint based on the mailbox being searched - ensure that we use the original searched mailbox as the mailbox to search for subsequent search (i.e. a search while we're viewing search results) and not the search mailbox Change-Id: Ic8663272173ce386dcd13fdf0369e918fb895be8
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
4689cb7100a8b1cfa188499a9910912d15b3dad3 |
|
27-Jun-2011 |
Makoto Onuki <omakoto@google.com> |
New account spinner - Don't use the action bar spinner. Instead use a custom view to show the current account. (It's not a spinner; now we show the dropdown list by ourselves, which gives us more detailed control.) - Also show the current mailbox name/unread count with the account name. - Removed the mailbox info loader in ABC. Instead, now the AccountSelectorAdapter loader loads the current account/mailbox name, and the unread count as extras. - Now ABC.Callback.onMailboxSelected passed an account ID as well as a mailbox ID. - There's new code paths that can cause the "fragment transaction in onLoadFinished" exception. We need to fix this properly, but for now we just use commitAllowingStateLoss(). Bug 4948352 Change-Id: I73bb8b7530f8328ca1c86382ac0a54086ad061d7
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
80d3875d306c60da83e547c573427627911f8a99 |
|
23-Jun-2011 |
Makoto Onuki <omakoto@google.com> |
Action bar: Use laoder to get current mailbox info Before this CL, we had this crazy plumbing from MailboxListFragment to ActionBarController to update the current mailbox name/message count. This wouldn't work on 1-pane, so now ABC just gets the current mailbox id from UIC and loads the name/count with its own loader. Also... - Fixed bug 4904450 and bug 4460470: Now we consistently use FolderProperties to get proler display names and message counts. - Renamed some confusing names in AccountSelectorAdapter Change-Id: Ic7bea6da6d2859006fb8f9263024c7d5e62b1e7f
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
53ea83ebf91f820692e8fa8e781f5cc982dd94db |
|
14-May-2011 |
Ben Komalo <benkomalo@google.com> |
Move Mailbox to top level class. No other changes made. Change-Id: I3d8f3c521dc0d902be313b25252b4b6a4a96e7ee
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
7219fccc42e6bfe8fe7978953b626f842174e628 |
|
14-Apr-2011 |
Todd Kennedy <toddke@google.com> |
Always display subfolder icon in the same view We were handling the subfolder icon strangely. Sometimes it was shown in the folder_icon view and sometimes in the folder_expanded_icon view. Now the folder_icon view is used exclusively for system folders (such as inbox, etc...) and folder_expanded_icon is always used for the expanded/collapsed icon. Change-Id: Ifff9a44cc792497a469c2408337dafd431f6dfc3
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
2b82c3f0a37ff1e09a21481fabfe4960006b8d83 |
|
12-Apr-2011 |
Todd Kennedy <toddke@google.com> |
Add columns to cursor to allow for proper layout The layout requires different indentation. Although the exact layout may change, we will likely always need to differentiate between the different mailbox types. Change-Id: Ia2ff84b552873f92fa45563b2dc0868c29bec3e3
/packages/apps/Email/src/com/android/email/FolderProperties.java
|
31d9acbf0623872f9d4a2b3210b5970854b654c7 |
|
12-Feb-2011 |
Marc Blank <mblank@google.com> |
Email split, part huit: Refactor constants, clean emailcommon * There are three pieces to this CL (sorry): 1) Move and/or rename some constants into emailcommon 2) Move Utility to emailcommon, moving the few UI related utilities back into Email (FolderProperties and UiUtilities) 3) Remove all references to resources from emailcommon * The three pieces relate in that, between them, they allow the emailcommon static library to compile cleanly Bug: 3442973 Change-Id: Ic5e3abaa2a1b36999e0b6653c6c2134ea1bd544f
/packages/apps/Email/src/com/android/email/FolderProperties.java
|