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

am f16a7612: Exclude all inbox labels when we\'re viewing an inbox

Browse Source 
* commit 'f16a7612c0bc4b4f03c9f8ba982c7723a5f33e17':
  Exclude all inbox labels when we're viewing an inbox
This commit is contained in:
Scott Kennedy 2013-03-21 01:21:58 +00:00 committed by Android Git Automerger
commit 9dcc001d58
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/email/provider/FolderPickerSelectorAdapter.java
View File

@ -22,7 +22,6 @@ import android.database.Cursor;
import com.android.mail.providers.Folder;
import com.android.mail.providers.UIProvider.FolderCapabilities;
import com.android.mail.providers.UIProvider.FolderType;
import com.android.mail.ui.HierarchicalFolderSelectorAdapter;
import java.util.Set;
@ -40,7 +39,7 @@ public class FolderPickerSelectorAdapter extends HierarchicalFolderSelectorAdapt
*/
protected boolean meetsRequirements(Folder folder) {
// We only want to show the non-Trash folders that can accept moved messages
return folder.supportsCapability(FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES) ||
folder.type == FolderType.TRASH;
return folder.supportsCapability(FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES)
|| folder.isTrash();
}
}

2
src/com/android/email/provider/WidgetProvider.java
View File

@ -106,7 +106,7 @@ public class WidgetProvider extends BaseWidgetProvider {
WidgetService.saveWidgetInformation(context, widgetId, uiAccount,
uiFolder.uri.toString());
updateWidgetInternal(context, widgetId, uiAccount, uiFolder.uri,
updateWidgetInternal(context, widgetId, uiAccount, uiFolder.type, uiFolder.uri,
uiFolder.conversationListUri, uiFolder.name);
// Now remove the old legacy preference value