ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add meta options in the picker 

With this CL, we have "All accounts" in the account list and "Inbox" & "Unread"
in the mailbox list. "All" + "Unread" doesn't play very well, so, we should
seriously consider whether it's worth the effort to support it right now.

Change-Id: Ia1c07c89a535a68ffe6f3ae5009b5b6591a9acdb
This commit is contained in:
Todd Kennedy 2011-05-27 14:41:32 -07:00
parent dc6f61a4c2
commit 0f84ff2c08
5 changed files with 112 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@ -184,6 +184,9 @@
<string name="notification_to_account">to <xliff:g id="receiver_name"
example="Main">%1$s</xliff:g></string>
<!-- Name given to "all accounts" in the account picker for shortcuts and widget [CHAR LIMIT=20] -->
<string name="account_name_display_all">All Accounts</string>
<!-- The number of accounts configured. [CHAR LIMIT=16] -->
<plurals name="number_of_accounts">
<item quantity="one"><xliff:g id="num_accounts" example="1">%1$d</xliff:g> account</item>
@ -216,6 +219,8 @@
<string name="mailbox_name_display_sent">Sent</string>
<!-- In the UI, the junk will be displayed with this name -->
<string name="mailbox_name_display_junk">Junk</string>
<!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
<string name="mailbox_name_display_unread">Unread</string>
<!-- Version number, shown only on debug screen -->
<string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>

4
src/com/android/email/activity/MailboxListFragment.java
View File

@ -276,7 +276,9 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
* @return true if the top level mailboxes are shown. Safe to call even before onCreate.
*/
public boolean isRoot() {
return getParentMailboxId() == Mailbox.NO_MAILBOX;
// TODO if we add meta-mailboxes to the database, remove special test for account ID
return getParentMailboxId() == Mailbox.NO_MAILBOX
|| getAccountId() == Account.ACCOUNT_ID_COMBINED_VIEW;
}
@Override

15
src/com/android/email/activity/ShortcutPicker.java
View File

@ -21,6 +21,7 @@ import com.android.email.activity.ShortcutPickerFragment.AccountShortcutPickerFr
import com.android.email.activity.ShortcutPickerFragment.PickerCallback;
import com.android.emailcommon.Logging;
import com.android.emailcommon.provider.EmailContent.Account;
import com.android.emailcommon.provider.EmailContent.Message;
import android.app.Activity;
import android.content.Intent;
@ -121,8 +122,18 @@ public class ShortcutPicker extends Activity implements OnClickListener, PickerC
shortcutIntent = MessageList.createFroyoIntent(myActivity, account);
Log.d(Logging.LOG_TAG, "Created old style intent: " + shortcutIntent);
} else {
String uuid = account.mCompatibilityUuid;
shortcutIntent = Welcome.createAccountShortcutIntent(myActivity, uuid, mailboxId);
// TODO if we add meta-mailboxes/accounts to the database, remove this special case
if (account.mId == Account.ACCOUNT_ID_COMBINED_VIEW) {
// For the special mailboxes, their ID is < 0. The UI list does not deal with
// negative values very well, so, add MAX_VALUE to ensure they're positive, but,
// don't clash with legitimate mailboxes. Undo that here.
long realMailboxId = mailboxId - Integer.MAX_VALUE;
shortcutIntent = Welcome.createOpenMessageIntent(
myActivity, account.mId, realMailboxId, Message.NO_MESSAGE);
} else {
String uuid = account.mCompatibilityUuid;
shortcutIntent = Welcome.createAccountShortcutIntent(myActivity, uuid, mailboxId);
}
}
// Then, set up the container intent (the response to the caller)

93
src/com/android/email/activity/ShortcutPickerFragment.java
View File

@ -26,10 +26,15 @@ import com.android.emailcommon.provider.Mailbox;
import android.app.Activity;
import android.app.ListFragment;
import android.app.LoaderManager.LoaderCallbacks;
import android.content.ContentValues;
import android.content.Context;
import android.content.CursorLoader;
import android.content.Loader;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.database.MergeCursor;
import android.database.MatrixCursor.RowBuilder;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
@ -104,6 +109,51 @@ public abstract class ShortcutPickerFragment extends ListFragment
/** Returns the cursor columns to map into list */
abstract String[] getFromColumns();
// TODO if we add meta-accounts to the database, remove this class entirely
private static final class AccountPickerLoader extends CursorLoader {
public AccountPickerLoader(Context context, Uri uri, String[] projection, String selection,
String[] selectionArgs, String sortOrder) {
super(context, uri, projection, selection, selectionArgs, sortOrder);
}
@Override
public Cursor loadInBackground() {
Cursor parentCursor = super.loadInBackground();
Cursor returnCursor;
if (parentCursor.getCount() > 1) {
// Only add "All accounts" if there is more than 1 account defined
MatrixCursor allAccountCursor = new MatrixCursor(getProjection());
addCombinedAccountRow(allAccountCursor);
returnCursor = new MergeCursor(new Cursor[] { allAccountCursor, parentCursor });
} else {
returnCursor = parentCursor;
}
return returnCursor;
}
/** Adds a row for "All Accounts" into the given cursor */
private void addCombinedAccountRow(MatrixCursor cursor) {
Context context = getContext();
Account account = new Account();
account.mId = Account.ACCOUNT_ID_COMBINED_VIEW;
account.mDisplayName = context.getString(R.string.account_name_display_all);
ContentValues values = account.toContentValues();
RowBuilder row = cursor.newRow();
for (String rowName : cursor.getColumnNames()) {
// special case some of the rows ...
if (AccountColumns.ID.equals(rowName)) {
row.add(Account.ACCOUNT_ID_COMBINED_VIEW);
continue;
} else if (AccountColumns.IS_DEFAULT.equals(rowName)) {
row.add(0);
continue;
}
row.add(values.get(rowName));
}
}
}
/** Account picker */
public static class AccountShortcutPickerFragment extends ShortcutPickerFragment {
private final static String[] ACCOUNT_FROM_COLUMNS = new String[] {
@ -125,8 +175,7 @@ public abstract class ShortcutPickerFragment extends ListFragment
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
Context context = getActivity();
// TODO Add ability to insert special account "all accounts"
return new CursorLoader(
return new AccountPickerLoader(
context, Account.CONTENT_URI, Account.CONTENT_PROJECTION, null, null, null);
}
@ -166,6 +215,41 @@ public abstract class ShortcutPickerFragment extends ListFragment
}
}
// TODO if we add meta-mailboxes to the database, remove this class entirely
private static final class MailboxPickerLoader extends CursorLoader {
private final long mAccountId;
public MailboxPickerLoader(Context context, Uri uri, String[] projection, String selection,
String[] selectionArgs, String sortOrder, long accountId) {
super(context, uri, projection, selection, selectionArgs, sortOrder);
mAccountId = accountId;
}
@Override
public Cursor loadInBackground() {
if (mAccountId == Account.ACCOUNT_ID_COMBINED_VIEW) {
// Do something special for the "combined" view
Context context = getContext();
MatrixCursor combinedMailboxesCursor = new MatrixCursor(getProjection());
// For the special mailboxes, their ID is < 0. The UI list does not deal with
// negative values very well, so, add MAX_VALUE to ensure they're positive, but,
// don't clash with legitimate mailboxes.
String mailboxName = context.getString(R.string.mailbox_name_display_inbox);
combinedMailboxesCursor.addRow(
new Object[] {Integer.MAX_VALUE + Mailbox.QUERY_ALL_INBOXES, mailboxName});
// TODO Temporarily commented out. This will be added to the widget selection, so
// keeping the code around for now. If this isn't uncommented by July 1, 2011,
// feel free to remove it and this TODO
// mailboxName = context.getString(R.string.mailbox_name_display_unread);
// combinedMailboxesCursor.addRow(
// new Object[] {Integer.MAX_VALUE + Mailbox.QUERY_ALL_UNREAD, mailboxName});
return combinedMailboxesCursor;
}
// Loading for a regular account; perform a normal load
return super.loadInBackground();
}
}
/** Mailbox picker */
public static class MailboxShortcutPickerFragment extends ShortcutPickerFragment {
static final String ARG_ACCOUNT = "MailboxShortcutPickerFragment.account";
@ -211,7 +295,6 @@ public abstract class ShortcutPickerFragment extends ListFragment
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
Context context = getActivity();
// TODO Add ability to insert special mailboxes like "starred", etc...
// TODO Create a fully-qualified path name for Exchange accounts [code should also work
// for MoveMessageToDialog.java]
HostAuth recvAuth = mAccount.getOrCreateHostAuthRecv(context);
@ -224,9 +307,9 @@ public abstract class ShortcutPickerFragment extends ListFragment
projection = IMAP_PROJECTION;
orderBy = MailboxColumns.SERVER_ID;
}
return new CursorLoader(
return new MailboxPickerLoader(
context, Mailbox.CONTENT_URI, projection, ALL_MAILBOX_SELECTION,
new String[] { Long.toString(mAccount.mId) }, orderBy);
new String[] { Long.toString(mAccount.mId) }, orderBy, mAccount.mId);
}
@Override

4
src/com/android/email/activity/Welcome.java
View File

@ -221,7 +221,9 @@ public class Welcome extends Activity {
// accountId will be NO_ACCOUNT if the UUID is invalid.
} else if (inputAccountId != Account.NO_ACCOUNT) {
if (Account.isValidId(context, inputAccountId)) {
// TODO if we add meta-mailboxes/accounts to the database, remove this special case
if (inputAccountId == Account.ACCOUNT_ID_COMBINED_VIEW
|| Account.isValidId(context, inputAccountId)) {
accountId = inputAccountId;
} else {
accountId = Account.NO_ACCOUNT;