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

Merge "Remove some stale stopships and TODO's"

Browse Source
This commit is contained in:
Ben Komalo 2011-07-01 16:36:29 -07:00 committed by Android (Google) Code Review
commit fdd99f5486
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/email/activity/MailboxFragmentAdapter.java
View File

@ -89,7 +89,6 @@ class MailboxFragmentAdapter extends CursorAdapter {
private static final int ROW_TYPE_MAILBOX = 0; private static final int ROW_TYPE_MAILBOX = 0;
/** Account "mailboxes" in the combined view */ /** Account "mailboxes" in the combined view */
private static final int ROW_TYPE_ACCOUNT = 1; private static final int ROW_TYPE_ACCOUNT = 1;
// STOPSHIP Need to determine if these types are sufficient for nested folders
// The following types are used when drilling into a mailbox // The following types are used when drilling into a mailbox
/** The current mailbox */ /** The current mailbox */
private static final int ROW_TYPE_CURMAILBOX = 2; private static final int ROW_TYPE_CURMAILBOX = 2;
@ -114,7 +113,6 @@ class MailboxFragmentAdapter extends CursorAdapter {
MailboxColumns.DISPLAY_NAME, MailboxColumns.TYPE, MailboxColumns.UNREAD_COUNT, MailboxColumns.DISPLAY_NAME, MailboxColumns.TYPE, MailboxColumns.UNREAD_COUNT,
MailboxColumns.MESSAGE_COUNT, ROW_TYPE_MAILBOX + " AS " + ROW_TYPE, MailboxColumns.MESSAGE_COUNT, ROW_TYPE_MAILBOX + " AS " + ROW_TYPE,
MailboxColumns.FLAGS, MailboxColumns.ACCOUNT_KEY }; MailboxColumns.FLAGS, MailboxColumns.ACCOUNT_KEY };
// STOPSHIP May need to adjust sub-folder projection depending upon final UX
/** /**
* Projection used to retrieve immediate children for a mailbox. The columns need to * Projection used to retrieve immediate children for a mailbox. The columns need to
* be identical to those in {@link #PROJECTION}. We are only changing the constant * be identical to those in {@link #PROJECTION}. We are only changing the constant

7
src/com/android/email/activity/MessageCompose.java
View File

@ -1714,10 +1714,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
createAndAddTab(R.string.forward_action, ACTION_FORWARD); createAndAddTab(R.string.forward_action, ACTION_FORWARD);
actionBar.setDisplayShowTitleEnabled(false); actionBar.setDisplayShowTitleEnabled(false);
try { // STOPSHIP workaround b/4520517 actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
} catch (RuntimeException ignore) {
}
} else { } else {
// Spinner based mode switching. // Spinner based mode switching.
if (mActionSpinnerAdapter == null) { if (mActionSpinnerAdapter == null) {
@ -1727,7 +1724,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
@Override @Override
public void onItemSelected( public void onItemSelected(
AdapterView<?> parent, View view, int position, long id) { AdapterView<?> parent, View view, int position, long id) {
setAction(mActionSpinnerAdapter.getAction(position)); setAction(ActionSpinnerAdapter.getAction(position));
} }
@Override @Override