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

Merge branch 'readonly-p4-donut' into donut

Browse Source
This commit is contained in:
Mihai Preda 2009-06-05 10:50:26 -07:00 committed by The Android Open Source Project
commit cf4a3aea3f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@ -129,6 +129,14 @@
<string name="special_mailbox_name_trash">Trash</string>
<!-- Do Not Translate. This is the name of the "sent" folder, on the server. -->
<string name="special_mailbox_name_sent">Sent</string>
<!-- In the folder list view, the outbox will be displayed with this name -->
<string name="special_mailbox_display_name_outbox">Outbox</string>
<!-- In the folder list view, the drafts will be displayed with this name -->
<string name="special_mailbox_display_name_drafts">Drafts</string>
<!-- In the folder list view, the trash will be displayed with this name -->
<string name="special_mailbox_display_name_trash">Trash</string>
<!-- In the folder list view, the sent will be displayed with this name -->
<string name="special_mailbox_display_name_sent">Sent</string>
<!-- Text on screen when you don't have any external email accounts set up -->
<string name="accounts_welcome">Welcome to Email setup!\n\nUse any email account with Email.\n\nMost popular email accounts can be set up in 2 steps!</string>

18
src/com/android/email/activity/FolderMessageList.java
View File

@ -1036,23 +1036,29 @@ public class FolderMessageList extends ExpandableListActivity {
}
/*
* Set special folder boolean indicator in FolderInfoHolder
* Set special folder boolean indicator and display name in FolderInfoHolder
*/
private void setSpecialFolderIndicator(FolderInfoHolder holder) {
private void setSpecialFolderInfo(FolderInfoHolder holder) {
String folderName = holder.name;
holder.special = true;
if (folderName.equalsIgnoreCase(Email.INBOX)) {
holder.inbox = true;
holder.displayName = getString(R.string.special_mailbox_name_inbox);
} else if (folderName.equals(mAccount.getDraftsFolderName())) {
holder.drafts = true;
holder.displayName = getString(R.string.special_mailbox_display_name_drafts);
} else if (folderName.equals(mAccount.getOutboxFolderName())) {
holder.outbox = true;
holder.displayName = getString(R.string.special_mailbox_display_name_outbox);
} else if (folderName.equals(mAccount.getSentFolderName())) {
holder.sent = true;
holder.displayName = getString(R.string.special_mailbox_display_name_sent);
} else if (folderName.equals(mAccount.getTrashFolderName())) {
holder.trash = true;
holder.displayName = getString(R.string.special_mailbox_display_name_trash);
} else {
holder.special = false;
holder.displayName = folderName;
}
}
@ -1068,13 +1074,7 @@ public class FolderMessageList extends ExpandableListActivity {
mFolders.add(holder);
}
holder.name = folder.getName();
if (holder.name.equalsIgnoreCase(Email.INBOX)) {
holder.displayName = getString(R.string.special_mailbox_name_inbox);
}
else {
holder.displayName = folder.getName();
}
setSpecialFolderIndicator(holder);
setSpecialFolderInfo(holder);
if (holder.messages == null) {
holder.messages = new ArrayList<MessageInfoHolder>();
}