summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java27
1 files changed, 21 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java
index 544e6ad295ff..67809fbc02d5 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java
@@ -16,8 +16,13 @@
package com.android.systemui.qs.tiles;
-import static android.graphics.drawable.Icon.TYPE_URI;
import static android.provider.Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT;
+import static android.graphics.drawable.Icon.TYPE_URI;
+import static android.graphics.drawable.Icon.TYPE_URI_ADAPTIVE_BITMAP;
+import static android.graphics.drawable.Icon.TYPE_RESOURCE;
+import static android.graphics.drawable.Icon.TYPE_BITMAP;
+import static android.graphics.drawable.Icon.TYPE_ADAPTIVE_BITMAP;
+import static android.graphics.drawable.Icon.TYPE_DATA;
import static com.android.systemui.wallet.controller.QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE;
@@ -226,11 +231,21 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> {
return;
}
mSelectedCard = cards.get(selectedIndex);
- android.graphics.drawable.Icon cardImageIcon = mSelectedCard.getCardImage();
- if (cardImageIcon.getType() == TYPE_URI) {
- mCardViewDrawable = null;
- } else {
- mCardViewDrawable = mSelectedCard.getCardImage().loadDrawable(mContext);
+ switch (mSelectedCard.getCardImage().getType()) {
+ case TYPE_URI:
+ case TYPE_URI_ADAPTIVE_BITMAP:
+ mCardViewDrawable = null;
+ break;
+ case TYPE_RESOURCE:
+ case TYPE_BITMAP:
+ case TYPE_ADAPTIVE_BITMAP:
+ case TYPE_DATA:
+ mCardViewDrawable = mSelectedCard.getCardImage().loadDrawable(mContext);
+ break;
+ default:
+ Log.e(TAG, "Unknown icon type: " + mSelectedCard.getCardImage().getType());
+ mCardViewDrawable = null;
+ break;
}
refreshState();
}