Merge "Remove Live-Folders"

3 files changed, 0 insertions, 112 deletions

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index e85f9a9e..8bf8d64b 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -140,7 +140,6 @@ import android.provider.ContactsContract.Settings;
 import android.provider.ContactsContract.StatusUpdates;
 import android.provider.ContactsContract.StreamItemPhotos;
 import android.provider.ContactsContract.StreamItems;
-import android.provider.LiveFolders;
 import android.provider.OpenableColumns;
 import android.provider.SyncStateContract;
 import android.telephony.PhoneNumberUtils;
@@ -333,11 +332,6 @@ public class ContactsProvider2 extends AbstractContactsProvider
     private static final int SEARCH_SUGGESTIONS = 12001;
     private static final int SEARCH_SHORTCUT = 12002;
 
-    private static final int LIVE_FOLDERS_CONTACTS = 14000;
-    private static final int LIVE_FOLDERS_CONTACTS_WITH_PHONES = 14001;
-    private static final int LIVE_FOLDERS_CONTACTS_FAVORITES = 14002;
-    private static final int LIVE_FOLDERS_CONTACTS_GROUP_NAME = 14003;
-
     private static final int RAW_CONTACT_ENTITIES = 15001;
 
     private static final int PROVIDER_STATUS = 16001;
@@ -1021,15 +1015,6 @@ public class ContactsProvider2 extends AbstractContactsProvider
             .add(StreamItemPhotos.SYNC4)
             .build();
 
-    /** Contains Live Folders columns */
-    private static final ProjectionMap sLiveFoldersProjectionMap = ProjectionMap.builder()
-            .add(LiveFolders._ID, Contacts._ID)
-            .add(LiveFolders.NAME, Contacts.DISPLAY_NAME)
-            // TODO: Put contact photo back when we have a way to display a default icon
-            // for contacts without a photo
-            // .add(LiveFolders.ICON_BITMAP, Photos.DATA)
-            .build();
-
     /** Contains {@link Directory} columns */
     private static final ProjectionMap sDirectoryProjectionMap = ProjectionMap.builder()
             .add(Directory._ID)
@@ -1187,15 +1172,6 @@ public class ContactsProvider2 extends AbstractContactsProvider
         matcher.addURI(ContactsContract.AUTHORITY, SearchManager.SUGGEST_URI_PATH_SHORTCUT + "/*",
                 SEARCH_SHORTCUT);
 
-        matcher.addURI(ContactsContract.AUTHORITY, "live_folders/contacts",
-                LIVE_FOLDERS_CONTACTS);
-        matcher.addURI(ContactsContract.AUTHORITY, "live_folders/contacts/*",
-                LIVE_FOLDERS_CONTACTS_GROUP_NAME);
-        matcher.addURI(ContactsContract.AUTHORITY, "live_folders/contacts_with_phones",
-                LIVE_FOLDERS_CONTACTS_WITH_PHONES);
-        matcher.addURI(ContactsContract.AUTHORITY, "live_folders/favorites",
-                LIVE_FOLDERS_CONTACTS_FAVORITES);
-
         matcher.addURI(ContactsContract.AUTHORITY, "provider_status", PROVIDER_STATUS);
 
         matcher.addURI(ContactsContract.AUTHORITY, "directories", DIRECTORIES);
@@ -5824,33 +5800,6 @@ public class ContactsProvider2 extends AbstractContactsProvider
                         mActiveDb.get(), projection, lookupKey, filter);
             }
 
-            case LIVE_FOLDERS_CONTACTS:
-                qb.setTables(Views.CONTACTS);
-                qb.setProjectionMap(sLiveFoldersProjectionMap);
-                break;
-
-            case LIVE_FOLDERS_CONTACTS_WITH_PHONES:
-                qb.setTables(Views.CONTACTS);
-                qb.setProjectionMap(sLiveFoldersProjectionMap);
-                qb.appendWhere(Contacts.HAS_PHONE_NUMBER + "=1");
-                break;
-
-            case LIVE_FOLDERS_CONTACTS_FAVORITES:
-                qb.setTables(Views.CONTACTS);
-                qb.setProjectionMap(sLiveFoldersProjectionMap);
-                qb.appendWhere(Contacts.STARRED + "=1");
-                break;
-
-            case LIVE_FOLDERS_CONTACTS_GROUP_NAME:
-                qb.setTables(Views.CONTACTS);
-                qb.setProjectionMap(sLiveFoldersProjectionMap);
-                qb.appendWhere(CONTACTS_IN_GROUP_SELECT);
-                String groupMimeTypeId = String.valueOf(
-                        mDbHelper.get().getMimeTypeId(GroupMembership.CONTENT_ITEM_TYPE));
-                selectionArgs = insertSelectionArg(selectionArgs, uri.getLastPathSegment());
-                selectionArgs = insertSelectionArg(selectionArgs, groupMimeTypeId);
-                break;
-
             case RAW_CONTACT_ENTITIES:
             case PROFILE_RAW_CONTACT_ENTITIES: {
                 setTablesAndProjectionMapForRawEntities(qb, uri);
diff --git a/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java b/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java
index d349d0e8..7b4864c3 100644
--- a/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java
@@ -27,7 +27,6 @@ import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Entity;
-import android.database.AbstractCursor;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 5f477bd3..b3a2ad83 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -32,7 +32,6 @@ import android.content.Entity;
 import android.content.EntityIterator;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
-import android.database.sqlite.SQLiteConstraintException;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.provider.ContactsContract;
@@ -65,7 +64,6 @@ import android.provider.ContactsContract.Settings;
 import android.provider.ContactsContract.StatusUpdates;
 import android.provider.ContactsContract.StreamItemPhotos;
 import android.provider.ContactsContract.StreamItems;
-import android.provider.LiveFolders;
 import android.provider.OpenableColumns;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.LargeTest;
@@ -601,15 +599,6 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         });
     }
 
-    public void testLiveFoldersProjection() {
-        assertProjection(
-            Uri.withAppendedPath(ContactsContract.AUTHORITY_URI, "live_folders/contacts"),
-            new String[]{
-                LiveFolders._ID,
-                LiveFolders.NAME,
-        });
-    }
-
     public void testDirectoryProjection() {
         assertProjection(Directory.CONTENT_URI, new String[]{
                 Directory._ID,
@@ -5380,55 +5369,6 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         testChangingPrimary(true, true);
     }
 
-    public void testLiveFolders() {
-        long rawContactId1 = createRawContactWithName("James", "Sullivan");
-        insertPhoneNumber(rawContactId1, "5234567890");
-        long contactId1 = queryContactId(rawContactId1);
-
-        long rawContactId2 = createRawContactWithName("Mike", "Wazowski");
-        long contactId2 = queryContactId(rawContactId2);
-        storeValue(Contacts.CONTENT_URI, contactId2, Contacts.STARRED, "1");
-
-        long rawContactId3 = createRawContactWithName("Randall", "Boggs");
-        long contactId3 = queryContactId(rawContactId3);
-        long groupId = createGroup(NO_ACCOUNT, "src1", "VIP");
-        insertGroupMembership(rawContactId3, groupId);
-
-        assertLiveFolderContents(
-                Uri.withAppendedPath(ContactsContract.AUTHORITY_URI,
-                        "live_folders/contacts"),
-                contactId1, "James Sullivan",
-                contactId2, "Mike Wazowski",
-                contactId3, "Randall Boggs");
-
-        assertLiveFolderContents(
-                Uri.withAppendedPath(ContactsContract.AUTHORITY_URI,
-                        "live_folders/contacts_with_phones"),
-                contactId1, "James Sullivan");
-
-        assertLiveFolderContents(
-                Uri.withAppendedPath(ContactsContract.AUTHORITY_URI,
-                        "live_folders/favorites"),
-                contactId2, "Mike Wazowski");
-
-        assertLiveFolderContents(
-                Uri.withAppendedPath(Uri.withAppendedPath(ContactsContract.AUTHORITY_URI,
-                        "live_folders/contacts"), Uri.encode("VIP")),
-                contactId3, "Randall Boggs");
-    }
-
-    private void assertLiveFolderContents(Uri uri, Object... expected) {
-        Cursor c = mResolver.query(uri, new String[]{LiveFolders._ID, LiveFolders.NAME},
-                null, null, LiveFolders._ID);
-        assertEquals(expected.length/2, c.getCount());
-        for (int i = 0; i < expected.length/2; i++) {
-            assertTrue(c.moveToNext());
-            assertEquals(((Long)expected[i * 2]).longValue(), c.getLong(0));
-            assertEquals(expected[i * 2 + 1], c.getString(1));
-        }
-        c.close();
-    }
-
     public void testContactCounts() {
         Uri uri = Contacts.CONTENT_URI.buildUpon()
                 .appendQueryParameter(ContactCounts.ADDRESS_BOOK_INDEX_EXTRAS, "true").build();