Merge "Using proper Unread icon for unread "folder"." into jb-ub-mail-ur9
This commit is contained in:
commit
5f1dbb7e66
BIN
res/drawable-hdpi/ic_folder_mark_unread_holo_dark.png
Normal file
BIN
res/drawable-hdpi/ic_folder_mark_unread_holo_dark.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.3 KiB |
BIN
res/drawable-hdpi/ic_folder_mark_unread_holo_light.png
Normal file
BIN
res/drawable-hdpi/ic_folder_mark_unread_holo_light.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.3 KiB |
BIN
res/drawable-mdpi/ic_folder_mark_unread_holo_dark.png
Normal file
BIN
res/drawable-mdpi/ic_folder_mark_unread_holo_dark.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 995 B |
BIN
res/drawable-mdpi/ic_folder_mark_unread_holo_light.png
Normal file
BIN
res/drawable-mdpi/ic_folder_mark_unread_holo_light.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1016 B |
BIN
res/drawable-xhdpi/ic_folder_mark_unread_holo_dark.png
Normal file
BIN
res/drawable-xhdpi/ic_folder_mark_unread_holo_dark.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
BIN
res/drawable-xhdpi/ic_folder_mark_unread_holo_light.png
Normal file
BIN
res/drawable-xhdpi/ic_folder_mark_unread_holo_light.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
20
res/drawable/ic_folder_mark_unread.xml
Normal file
20
res/drawable/ic_folder_mark_unread.xml
Normal file
@ -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>
|
@ -3008,8 +3008,7 @@ public class EmailProvider extends ContentProvider {
|
|||||||
" NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME +
|
" NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME +
|
||||||
" WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null);
|
" WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null);
|
||||||
row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = count;
|
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_folder_mark_unread;
|
||||||
row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_mark_unread_holo_light;
|
|
||||||
mc.addRow(row);
|
mc.addRow(row);
|
||||||
return mc;
|
return mc;
|
||||||
} else {
|
} else {
|
||||||
@ -3033,8 +3032,7 @@ public class EmailProvider extends ContentProvider {
|
|||||||
" NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME +
|
" NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME +
|
||||||
" WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null);
|
" WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null);
|
||||||
row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = numUnread;
|
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_folder_mark_unread;
|
||||||
row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_mark_unread_holo_light;
|
|
||||||
mc.addRow(row);
|
mc.addRow(row);
|
||||||
Cursor[] cursors = new Cursor[] {mc, c};
|
Cursor[] cursors = new Cursor[] {mc, c};
|
||||||
return new MergeCursor(cursors);
|
return new MergeCursor(cursors);
|
||||||
|
Loading…
Reference in New Issue
Block a user