diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8f412e342fa8e..f6862cd3ad635 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1211,7 +1211,7 @@ Show all - Add a card + Tap to open Updating 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 772e9faf6feb7..248c78e557cce 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java @@ -147,16 +147,9 @@ public class QuickAccessWalletTile extends QSTileImpl { if (mController.getWalletClient().isWalletServiceAvailable() && mController.getWalletClient().isWalletFeatureAvailable()) { if (mSelectedCard != null) { - if (isDeviceLocked) { - state.state = Tile.STATE_INACTIVE; - state.secondaryLabel = - mContext.getString(R.string.wallet_secondary_label_device_locked); - state.sideViewCustomDrawable = null; - } else { - state.state = Tile.STATE_ACTIVE; - state.secondaryLabel = mSelectedCard.getContentDescription(); - state.sideViewCustomDrawable = mCardViewDrawable; - } + state.state = isDeviceLocked ? Tile.STATE_INACTIVE : Tile.STATE_ACTIVE; + state.secondaryLabel = mSelectedCard.getContentDescription(); + state.sideViewCustomDrawable = mCardViewDrawable; } else { state.state = Tile.STATE_INACTIVE; state.secondaryLabel = diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java index c88ceac458eed..4f6475f0148bc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java @@ -90,6 +90,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { private static final String CARD_ID = "card_id"; private static final String LABEL = "QAW"; + private static final String CARD_DESCRIPTION = "•••• 1234"; private static final Icon CARD_IMAGE = Icon.createWithBitmap(Bitmap.createBitmap(70, 50, Bitmap.Config.ARGB_8888)); @@ -282,9 +283,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { mTile.handleUpdateState(state, null); assertEquals(Tile.STATE_ACTIVE, state.state); - assertEquals( - "•••• 1234", - state.secondaryLabel); + assertEquals(CARD_DESCRIPTION, state.secondaryLabel); assertNotNull(state.stateDescription); assertNotNull(state.sideViewCustomDrawable); } @@ -298,11 +297,9 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { mTile.handleUpdateState(state, null); assertEquals(Tile.STATE_INACTIVE, state.state); - assertEquals( - mContext.getString(R.string.wallet_secondary_label_device_locked), - state.secondaryLabel); + assertEquals(CARD_DESCRIPTION, state.secondaryLabel); assertNotNull(state.stateDescription); - assertNull(state.sideViewCustomDrawable); + assertNotNull(state.sideViewCustomDrawable); } @Test @@ -314,9 +311,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { mTile.handleUpdateState(state, null); assertEquals(Tile.STATE_ACTIVE, state.state); - assertEquals( - "•••• 1234", - state.secondaryLabel); + assertEquals(CARD_DESCRIPTION, state.secondaryLabel); assertNotNull(state.stateDescription); assertNotNull(state.sideViewCustomDrawable); } @@ -426,6 +421,6 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { private WalletCard createWalletCard(Context context) { PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, mWalletIntent, PendingIntent.FLAG_IMMUTABLE); - return new WalletCard.Builder(CARD_ID, CARD_IMAGE, "•••• 1234", pendingIntent).build(); + return new WalletCard.Builder(CARD_ID, CARD_IMAGE, CARD_DESCRIPTION, pendingIntent).build(); } }