Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use isServiceAvailable for wallet tile availability" into sc-dev

Browse Source
This commit is contained in:
Silin Huang
2021-04-13 20:18:11 +00:00
committed by Android (Google) Code Review
parent bceed6d6ba 0861012a45
commit 4737c51520
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java
View File

@@ -138,12 +138,11 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> {
@Override
protected void handleUpdateState(State state, Object arg) {
CharSequence qawLabel = mQuickAccessWalletClient.getServiceLabel();
state.label = qawLabel == null ? mLabel : qawLabel;
state.label = mLabel;
state.contentDescription = state.label;
state.icon = ResourceIcon.get(R.drawable.ic_qs_wallet);
boolean isDeviceLocked = !mKeyguardStateController.isUnlocked();
if (mQuickAccessWalletClient.isWalletFeatureAvailable()) {
if (mQuickAccessWalletClient.isWalletServiceAvailable()) {
if (mHasCard) {
if (isDeviceLocked) {
state.state = Tile.STATE_INACTIVE;

14
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java
View File

@@ -141,6 +141,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase {
when(mHost.getUiEventLogger()).thenReturn(mUiEventLogger);
when(mFeatureFlags.isQuickAccessWalletEnabled()).thenReturn(true);
when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(true);
when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(true);
mTile = new QuickAccessWalletTile(
mHost,
@@ -171,13 +172,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase {
}
@Test
public void testIsAvailable_qawServiceNotAvailable() {
when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(false);
assertFalse(mTile.isAvailable());
}
@Test
public void testIsAvailable_qawServiceAvailable() {
public void testIsAvailable_qawFeatureAvailable() {
when(mPackageManager.hasSystemFeature(FEATURE_NFC_HOST_CARD_EMULATION)).thenReturn(true);
when(mPackageManager.hasSystemFeature("org.chromium.arc")).thenReturn(false);
when(mSecureSettings.getString(NFC_PAYMENT_DEFAULT_COMPONENT)).thenReturn("Component");
@@ -229,11 +224,10 @@ public class QuickAccessWalletTileTest extends SysuiTestCase {
public void testHandleUpdateState_updateLabelAndIcon() {
QSTile.State state = new QSTile.State();
QSTile.Icon icon = QSTileImpl.ResourceIcon.get(R.drawable.ic_qs_wallet);
when(mQuickAccessWalletClient.getServiceLabel()).thenReturn("QuickAccessWallet");
mTile.handleUpdateState(state, null);
assertEquals("QuickAccessWallet", state.label.toString());
assertEquals(mContext.getString(R.string.wallet_title), state.label.toString());
assertTrue(state.label.toString().contentEquals(state.contentDescription));
assertEquals(icon, state.icon);
}
@@ -288,7 +282,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase {
@Test
public void testHandleUpdateState_qawFeatureUnavailable_tileUnavailable() {
when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(false);
when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(false);
QSTile.State state = new QSTile.State();
mTile.handleUpdateState(state, null);