Switch to material icons for Email

b/15966080

Change-Id: I5d6097e37cb47356fc70a38e1aa2ae0c41e9ae7a

res/drawable/ic_folder_drafts.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_drafts_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_drafts_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_drafts_holo_light" />
-</selector>

res/drawable/ic_folder_inbox.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_inbox_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_inbox_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_inbox_holo_light" />
-</selector>

res/drawable/ic_folder_outbox.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_outbox_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_outbox_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_outbox_holo_light" />
-</selector>

res/drawable/ic_folder_sent.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_sent_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_sent_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_sent_holo_light" />
-</selector>

res/drawable/ic_folder_star.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_star_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_star_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_star_holo_light" />
-</selector>

res/drawable/ic_folder_trash.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_trash_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_trash_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_trash_holo_light" />
-</selector>

res/drawable/ic_folder_unread.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_unread_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_unread_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_unread_holo_light" />
-</selector>

src/com/android/email/provider/EmailProvider.java

@@ -2673,13 +2673,13 @@ public class EmailProvider extends ContentProvider
             + " ELSE " + UIProvider.FolderType.DEFAULT + " END";
 
     private static final String FOLDER_ICON = "CASE " + MailboxColumns.TYPE
-            + " WHEN " + Mailbox.TYPE_INBOX   + " THEN " + R.drawable.ic_folder_inbox
-            + " WHEN " + Mailbox.TYPE_DRAFTS  + " THEN " + R.drawable.ic_folder_drafts
-            + " WHEN " + Mailbox.TYPE_OUTBOX  + " THEN " + R.drawable.ic_folder_outbox
-            + " WHEN " + Mailbox.TYPE_SENT    + " THEN " + R.drawable.ic_folder_sent
-            + " WHEN " + Mailbox.TYPE_TRASH   + " THEN " + R.drawable.ic_folder_trash
-            + " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_folder_star
-            + " ELSE -1 END";
+            + " WHEN " + Mailbox.TYPE_INBOX   + " THEN " + R.drawable.ic_drawer_inbox
+            + " WHEN " + Mailbox.TYPE_DRAFTS  + " THEN " + R.drawable.ic_drawer_drafts
+            + " WHEN " + Mailbox.TYPE_OUTBOX  + " THEN " + R.drawable.ic_drawer_outbox
+            + " WHEN " + Mailbox.TYPE_SENT    + " THEN " + R.drawable.ic_drawer_sent
+            + " WHEN " + Mailbox.TYPE_TRASH   + " THEN " + R.drawable.ic_drawer_trash
+            + " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_drawer_starred
+            + " ELSE " + R.drawable.ic_drawer_folder + " END";
 
     /**
      * Local-only folders set totalCount < 0; such folders should substitute message count for
@@ -3799,11 +3799,11 @@ public class EmailProvider extends ContentProvider
                 }
             } else if (column.equals(UIProvider.FolderColumns.ICON_RES_ID)) {
                 if (mailboxType == Mailbox.TYPE_INBOX) {
-                    values[i] = R.drawable.ic_folder_inbox;
+                    values[i] = R.drawable.ic_drawer_inbox;
                 } else if (mailboxType == Mailbox.TYPE_UNREAD) {
-                    values[i] = R.drawable.ic_folder_unread;
+                    values[i] = R.drawable.ic_drawer_unread;
                 } else if (mailboxType == Mailbox.TYPE_STARRED) {
-                    values[i] = R.drawable.ic_folder_star;
+                    values[i] = R.drawable.ic_drawer_starred;
                 }
             }
         }