From feb8869c4f0681a6e202d8db8a77aa3c2ba4b667 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Tue, 5 Oct 2010 16:14:28 -0700 Subject: [PATCH] Remove unused method Utility.getIconIds() And redirected the related tests to getIcon(). Bug 2894555 Change-Id: I1d90f01e7476ca79bddd644e123ad979d6ebe987 --- src/com/android/email/Utility.java | 4 ---- .../src/com/android/email/UtilityUnitTests.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/com/android/email/Utility.java b/src/com/android/email/Utility.java index 81f5f84f1..532cb1383 100644 --- a/src/com/android/email/Utility.java +++ b/src/com/android/email/Utility.java @@ -406,10 +406,6 @@ public class Utility { return getIcon(-1, id); } - public Drawable getIconIds(int type) { - return getIcon(type, -1); - } - /** * Lookup names of localized special mailboxes */ diff --git a/tests/src/com/android/email/UtilityUnitTests.java b/tests/src/com/android/email/UtilityUnitTests.java index 29bd8c452..97ecf935a 100644 --- a/tests/src/com/android/email/UtilityUnitTests.java +++ b/tests/src/com/android/email/UtilityUnitTests.java @@ -112,14 +112,14 @@ public class UtilityUnitTests extends AndroidTestCase { Utility.FolderProperties fp = Utility.FolderProperties.getInstance(mContext); // Make sure they're available - Drawable inbox = fp.getIconIds(Mailbox.TYPE_INBOX); - Drawable mail = fp.getIconIds(Mailbox.TYPE_MAIL); - Drawable parent = fp.getIconIds(Mailbox.TYPE_PARENT); - Drawable drafts = fp.getIconIds(Mailbox.TYPE_DRAFTS); - Drawable outbox = fp.getIconIds(Mailbox.TYPE_OUTBOX); - Drawable sent = fp.getIconIds(Mailbox.TYPE_SENT); - Drawable trash = fp.getIconIds(Mailbox.TYPE_TRASH); - Drawable junk = fp.getIconIds(Mailbox.TYPE_JUNK); + Drawable inbox = fp.getIcon(Mailbox.TYPE_INBOX, -1); + Drawable mail = fp.getIcon(Mailbox.TYPE_MAIL, -1); + Drawable parent = fp.getIcon(Mailbox.TYPE_PARENT, -1); + Drawable drafts = fp.getIcon(Mailbox.TYPE_DRAFTS, -1); + Drawable outbox = fp.getIcon(Mailbox.TYPE_OUTBOX, -1); + Drawable sent = fp.getIcon(Mailbox.TYPE_SENT, -1); + Drawable trash = fp.getIcon(Mailbox.TYPE_TRASH, -1); + Drawable junk = fp.getIcon(Mailbox.TYPE_JUNK, -1); // Make sure they're unique Set set = new HashSet();