Exclude all inbox labels when we're viewing an inbox
Bug: 8426563 Change-Id: I7707c9ebf9ebcb73be73ef82f5f2212514671bfe
This commit is contained in:
parent
0da0c18ede
commit
f16a7612c0
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue