Fixed label icons when selected.
Fixes b/8599310. Using selector xml drawables to properly get the right assets for the folder labels. Also did some renaming/moving cleanup. Change-Id: I3b5ddc9fb9da239131405880e637fa1df2c99ea6
BIN
res/drawable-hdpi/ic_folder_drafts_holo_dark.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
res/drawable-hdpi/ic_folder_inbox_holo_dark.png
Normal file
After Width: | Height: | Size: 916 B |
BIN
res/drawable-hdpi/ic_folder_outbox_holo_dark.png
Normal file
After Width: | Height: | Size: 797 B |
BIN
res/drawable-hdpi/ic_folder_sent_holo_dark.png
Normal file
After Width: | Height: | Size: 1013 B |
BIN
res/drawable-hdpi/ic_folder_star_holo_dark.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
res/drawable-hdpi/ic_folder_star_holo_light.png
Normal file
After Width: | Height: | Size: 501 B |
BIN
res/drawable-hdpi/ic_folder_trash_holo_dark.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
res/drawable-hdpi/ic_folder_trash_holo_light.png
Normal file
After Width: | Height: | Size: 530 B |
BIN
res/drawable-mdpi/ic_exchange_minitab_selected.png
Normal file
After Width: | Height: | Size: 933 B |
BIN
res/drawable-mdpi/ic_exchange_selected.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
res/drawable-mdpi/ic_folder_drafts_holo_dark.png
Normal file
After Width: | Height: | Size: 900 B |
BIN
res/drawable-mdpi/ic_folder_drafts_holo_light.png
Normal file
After Width: | Height: | Size: 734 B |
BIN
res/drawable-mdpi/ic_folder_inbox_holo_dark.png
Normal file
After Width: | Height: | Size: 715 B |
BIN
res/drawable-mdpi/ic_folder_inbox_holo_light.png
Normal file
After Width: | Height: | Size: 604 B |
BIN
res/drawable-mdpi/ic_folder_outbox_holo_dark.png
Normal file
After Width: | Height: | Size: 660 B |
BIN
res/drawable-mdpi/ic_folder_outbox_holo_light.png
Normal file
After Width: | Height: | Size: 540 B |
BIN
res/drawable-mdpi/ic_folder_sent_holo_dark.png
Normal file
After Width: | Height: | Size: 798 B |
BIN
res/drawable-mdpi/ic_folder_sent_holo_light.png
Normal file
After Width: | Height: | Size: 629 B |
BIN
res/drawable-mdpi/ic_folder_star_holo_dark.png
Normal file
After Width: | Height: | Size: 986 B |
BIN
res/drawable-mdpi/ic_folder_star_holo_light.png
Normal file
After Width: | Height: | Size: 345 B |
BIN
res/drawable-mdpi/ic_folder_trash_holo_dark.png
Normal file
After Width: | Height: | Size: 908 B |
BIN
res/drawable-mdpi/ic_folder_trash_holo_light.png
Normal file
After Width: | Height: | Size: 343 B |
BIN
res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png
Normal file
After Width: | Height: | Size: 214 B |
BIN
res/drawable-xhdpi/ic_folder_drafts_holo_dark.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
res/drawable-xhdpi/ic_folder_inbox_holo_dark.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
res/drawable-xhdpi/ic_folder_outbox_holo_dark.png
Normal file
After Width: | Height: | Size: 880 B |
BIN
res/drawable-xhdpi/ic_folder_sent_holo_dark.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
res/drawable-xhdpi/ic_folder_star_holo_dark.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
res/drawable-xhdpi/ic_folder_star_holo_light.png
Normal file
After Width: | Height: | Size: 840 B |
BIN
res/drawable-xhdpi/ic_folder_trash_holo_dark.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
res/drawable-xhdpi/ic_folder_trash_holo_light.png
Normal file
After Width: | Height: | Size: 653 B |
20
res/drawable/ic_folder_drafts.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_drafts_holo_dark" />
|
||||
<item android:drawable="@drawable/ic_folder_drafts_holo_light" />
|
||||
</selector>
|
20
res/drawable/ic_folder_inbox.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_inbox_holo_dark" />
|
||||
<item android:drawable="@drawable/ic_folder_inbox_holo_light" />
|
||||
</selector>
|
20
res/drawable/ic_folder_outbox.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_outbox_holo_dark" />
|
||||
<item android:drawable="@drawable/ic_folder_outbox_holo_light" />
|
||||
</selector>
|
20
res/drawable/ic_folder_sent.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_sent_holo_dark" />
|
||||
<item android:drawable="@drawable/ic_folder_sent_holo_light" />
|
||||
</selector>
|
20
res/drawable/ic_folder_star.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_star_holo_dark" />
|
||||
<item android:drawable="@drawable/ic_folder_star_holo_light" />
|
||||
</selector>
|
20
res/drawable/ic_folder_trash.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_trash_holo_dark" />
|
||||
<item android:drawable="@drawable/ic_folder_trash_holo_light" />
|
||||
</selector>
|
@ -1970,12 +1970,12 @@ 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_holo_light
|
||||
+ " WHEN " + Mailbox.TYPE_DRAFTS + " THEN " + R.drawable.ic_folder_drafts_holo_light
|
||||
+ " WHEN " + Mailbox.TYPE_OUTBOX + " THEN " + R.drawable.ic_folder_outbox_holo_light
|
||||
+ " WHEN " + Mailbox.TYPE_SENT + " THEN " + R.drawable.ic_folder_sent_holo_light
|
||||
+ " WHEN " + Mailbox.TYPE_TRASH + " THEN " + R.drawable.ic_menu_trash_holo_light
|
||||
+ " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_menu_star_holo_light
|
||||
+ " 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";
|
||||
|
||||
private static ProjectionMap getFolderListMap() {
|
||||
@ -2994,13 +2994,13 @@ public class EmailProvider extends ContentProvider {
|
||||
"=" + Mailbox.TYPE_INBOX + ") AND " + MessageColumns.FLAG_READ + "=0", null);
|
||||
row = getVirtualMailboxRow(COMBINED_ACCOUNT_ID, Mailbox.TYPE_INBOX);
|
||||
row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = count;
|
||||
row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_inbox_holo_light;
|
||||
row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_inbox;
|
||||
mc.addRow(row);
|
||||
count = EmailContent.count(context, Message.CONTENT_URI,
|
||||
MessageColumns.FLAG_FAVORITE + "=1", null);
|
||||
row = getVirtualMailboxRow(COMBINED_ACCOUNT_ID, Mailbox.TYPE_STARRED);
|
||||
row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = count;
|
||||
row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_star_holo_light;
|
||||
row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_star;
|
||||
mc.addRow(row);
|
||||
row = getVirtualMailboxRow(COMBINED_ACCOUNT_ID, Mailbox.TYPE_ALL_UNREAD);
|
||||
count = EmailContent.count(context, Message.CONTENT_URI,
|
||||
@ -3024,7 +3024,7 @@ public class EmailProvider extends ContentProvider {
|
||||
final long acctId = Long.parseLong(id);
|
||||
Object[] row = getVirtualMailboxRow(acctId, Mailbox.TYPE_STARRED);
|
||||
row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = numStarred;
|
||||
row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_star_holo_light;
|
||||
row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_star;
|
||||
mc.addRow(row);
|
||||
row = getVirtualMailboxRow(acctId, Mailbox.TYPE_ALL_UNREAD);
|
||||
int numUnread = EmailContent.count(context, Message.CONTENT_URI,
|
||||
|