am f57159ca: am 5f1dbb7e: Merge "Using proper Unread icon for unread "folder"." into jb-ub-mail-ur9

* commit 'f57159caf7bf114e3da75429f7ebd1ea83ea786b':
  Using proper Unread icon for unread "folder".

res/drawable/ic_folder_mark_unread.xml

@@ -0,0 +1,20 @@
+<?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">
+    <item android:state_activated="true" android:drawable="@drawable/ic_folder_mark_unread_holo_dark" />
+    <item android:drawable="@drawable/ic_folder_mark_unread_holo_light" />
+</selector>

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

@@ -3008,8 +3008,7 @@ public class EmailProvider extends ContentProvider {
                     " NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME +
                     " WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null);
             row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = count;
-            // TODO: Hijacking the mark unread icon for now.
-            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_mark_unread_holo_light;
+            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_mark_unread;
             mc.addRow(row);
             return mc;
         } else {
@@ -3033,8 +3032,7 @@ public class EmailProvider extends ContentProvider {
                     " NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME +
                     " WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null);
             row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = numUnread;
-            // TODO: Hijacking the mark unread icon for now.
-            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_mark_unread_holo_light;
+            row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_mark_unread;
             mc.addRow(row);
             Cursor[] cursors = new Cursor[] {mc, c};
             return new MergeCursor(cursors);