From 29c89ad17a0983ddc4eb2b4922c93a53aff2d735 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Wed, 29 Jun 2011 13:35:59 -0700
Subject: [PATCH] Just mark search mailbox as not visible

This way we don't have to explicitly filter it in all the different
places we do selections on mailboxes.

Note that I didn't create an upgrade path for this. The only people with
search mailboxes are probably developers right now, and worst case for
people who experimented, they will just get the search mailbox visible

Change-Id: I9a0bf6df9985418d467a7348ed99a36521641b89
---
 src/com/android/email/Controller.java                      | 6 +++---
 src/com/android/email/activity/MailboxFragmentAdapter.java | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/com/android/email/Controller.java b/src/com/android/email/Controller.java
index be163cb7f..d281688b9 100644
--- a/src/com/android/email/Controller.java
+++ b/src/com/android/email/Controller.java
@@ -268,7 +268,7 @@ public class Controller {
             m = new Mailbox();
             m.mAccountKey = accountId;
             m.mServerId = SEARCH_MAILBOX_SERVER_ID;
-            m.mFlagVisible = true;
+            m.mFlagVisible = false;
             m.mDisplayName = SEARCH_MAILBOX_SERVER_ID;
             m.mSyncInterval = Mailbox.CHECK_INTERVAL_NEVER;
             m.mType = Mailbox.TYPE_SEARCH;
@@ -898,14 +898,14 @@ public class Controller {
 
     private static final HashMap<Long, SearchParams> sSearchParamsMap =
         new HashMap<Long, SearchParams>();
-    
+
     public void searchMore(long accountId) throws MessagingException {
         SearchParams params = sSearchParamsMap.get(accountId);
         if (params == null) return;
         params.mOffset += params.mLimit;
         searchMessages(accountId, params);
     }
-    
+
     /**
      * Search for messages on the (IMAP) server; do not call this on the UI thread!
      * @param accountId the id of the account to be searched
diff --git a/src/com/android/email/activity/MailboxFragmentAdapter.java b/src/com/android/email/activity/MailboxFragmentAdapter.java
index 687871f7a..2762caf2b 100644
--- a/src/com/android/email/activity/MailboxFragmentAdapter.java
+++ b/src/com/android/email/activity/MailboxFragmentAdapter.java
@@ -141,8 +141,7 @@ class MailboxFragmentAdapter extends CursorAdapter {
             " AND " + Mailbox.USER_VISIBLE_MAILBOX_SELECTION;
     /** All system mailboxes for an account */
     private static final String SYSTEM_MAILBOX_SELECTION = ALL_MAILBOX_SELECTION
-            + " AND " + MailboxColumns.TYPE + "!=" + Mailbox.TYPE_MAIL
-            + " AND " + MailboxColumns.TYPE + "!=" + Mailbox.TYPE_SEARCH;
+            + " AND " + MailboxColumns.TYPE + "!=" + Mailbox.TYPE_MAIL;
     /** All mailboxes with the given parent */
     private static final String USER_MAILBOX_SELECTION_WITH_PARENT = ALL_MAILBOX_SELECTION
             + " AND " + MailboxColumns.PARENT_KEY + "=?"