diff --git a/packages/SystemUI/res/values/flags.xml b/packages/SystemUI/res/values/flags.xml index c388b1ece7868..027f162445c05 100644 --- a/packages/SystemUI/res/values/flags.xml +++ b/packages/SystemUI/res/values/flags.xml @@ -33,15 +33,11 @@ false - false - false true - false - false true diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt index c2a6255e11e8e..69d49d44f822d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt @@ -24,7 +24,6 @@ import com.android.systemui.qs.QSHost import com.android.systemui.qs.logging.QSLogger import com.android.systemui.qs.tileimpl.QSTileImpl import com.android.systemui.settings.UserTracker -import com.android.systemui.statusbar.FeatureFlags import com.android.systemui.statusbar.policy.NextAlarmController import java.util.Locale import javax.inject.Inject @@ -38,7 +37,6 @@ class AlarmTile @Inject constructor( statusBarStateController: StatusBarStateController, activityStarter: ActivityStarter, qsLogger: QSLogger, - private val featureFlags: FeatureFlags, private val userTracker: UserTracker, nextAlarmController: NextAlarmController ) : QSTileImpl( @@ -65,10 +63,6 @@ class AlarmTile @Inject constructor( nextAlarmController.observe(this, callback) } - override fun isAvailable(): Boolean { - return featureFlags.isAlarmTileAvailable - } - override fun newTileState(): QSTile.State { return QSTile.State().apply { handlesLongClick = false 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 7fab0f5f802c5..0e4434baa0e80 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java @@ -49,7 +49,6 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.qs.QSHost; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; -import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.wallet.controller.QuickAccessWalletController; @@ -71,7 +70,6 @@ public class QuickAccessWalletTile extends QSTileImpl { private final PackageManager mPackageManager; private final SecureSettings mSecureSettings; private final QuickAccessWalletController mController; - private final FeatureFlags mFeatureFlags; private WalletCard mSelectedCard; @VisibleForTesting Drawable mCardViewDrawable; @@ -89,15 +87,13 @@ public class QuickAccessWalletTile extends QSTileImpl { KeyguardStateController keyguardStateController, PackageManager packageManager, SecureSettings secureSettings, - QuickAccessWalletController quickAccessWalletController, - FeatureFlags featureFlags) { + QuickAccessWalletController quickAccessWalletController) { super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger, statusBarStateController, activityStarter, qsLogger); mController = quickAccessWalletController; mKeyguardStateController = keyguardStateController; mPackageManager = packageManager; mSecureSettings = secureSettings; - mFeatureFlags = featureFlags; } @@ -192,8 +188,7 @@ public class QuickAccessWalletTile extends QSTileImpl { @Override public boolean isAvailable() { - return mFeatureFlags.isQuickAccessWalletEnabled() - && mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION) + return mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION) && !mPackageManager.hasSystemFeature(FEATURE_CHROME_OS) && mSecureSettings.getString(NFC_PAYMENT_DEFAULT_COMPONENT) != null; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java b/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java index c7b6e67cf96de..7e676197ddad2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java @@ -65,18 +65,10 @@ public class FeatureFlags { return mFlagReader.isEnabled(R.bool.flag_monet); } - public boolean isQuickAccessWalletEnabled() { - return mFlagReader.isEnabled(R.bool.flag_wallet); - } - public boolean isPMLiteEnabled() { return mFlagReader.isEnabled(R.bool.flag_pm_lite); } - public boolean isAlarmTileAvailable() { - return mFlagReader.isEnabled(R.bool.flag_alarm_tile); - } - public boolean isChargingRippleEnabled() { return mFlagReader.isEnabled(R.bool.flag_charging_ripple); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 32b3e51076d3c..e30c53f959e9a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -1126,10 +1126,7 @@ public class NotificationPanelViewController extends PanelViewController { mKeyguardBottomArea.setStatusBar(mStatusBar); mKeyguardBottomArea.setUserSetupComplete(mUserSetupComplete); mKeyguardBottomArea.setFalsingManager(mFalsingManager); - - if (mFeatureFlags.isQuickAccessWalletEnabled()) { - mKeyguardBottomArea.initWallet(mQuickAccessWalletController); - } + mKeyguardBottomArea.initWallet(mQuickAccessWalletController); } private void updateMaxDisplayedNotifications(boolean recompute) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/AlarmTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/AlarmTileTest.kt index a435768723d7d..32b1f433dfcf2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/AlarmTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/AlarmTileTest.kt @@ -16,7 +16,6 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.qs.QSHost import com.android.systemui.qs.logging.QSLogger import com.android.systemui.settings.UserTracker -import com.android.systemui.statusbar.FeatureFlags import com.android.systemui.statusbar.policy.NextAlarmController import com.android.systemui.util.mockito.capture import com.android.systemui.util.mockito.eq @@ -47,8 +46,6 @@ class AlarmTileTest : SysuiTestCase() { @Mock private lateinit var qsLogger: QSLogger @Mock - private lateinit var featureFlags: FeatureFlags - @Mock private lateinit var userTracker: UserTracker @Mock private lateinit var nextAlarmController: NextAlarmController @@ -79,7 +76,6 @@ class AlarmTileTest : SysuiTestCase() { statusBarStateController, activityStarter, qsLogger, - featureFlags, userTracker, nextAlarmController ) @@ -90,14 +86,7 @@ class AlarmTileTest : SysuiTestCase() { } @Test - fun testNotAvailableFeatureFlag() { - `when`(featureFlags.isAlarmTileAvailable).thenReturn(false) - assertThat(tile.isAvailable).isFalse() - } - - @Test - fun testAvailableFeatureFlag() { - `when`(featureFlags.isAlarmTileAvailable).thenReturn(true) + fun testAvailable() { assertThat(tile.isAvailable).isTrue() } 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 09b042700dd88..e4a9aacb57abd 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 @@ -69,7 +69,6 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.qs.QSTileHost; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; -import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.settings.SecureSettings; import com.android.systemui.wallet.controller.QuickAccessWalletController; @@ -118,8 +117,6 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { private SecureSettings mSecureSettings; @Mock private QuickAccessWalletController mController; - @Mock - private FeatureFlags mFeatureFlags; @Captor ArgumentCaptor mIntentCaptor; @Captor @@ -139,7 +136,6 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { doNothing().when(mSpiedContext).startActivity(any(Intent.class)); when(mHost.getContext()).thenReturn(mSpiedContext); when(mHost.getUiEventLogger()).thenReturn(mUiEventLogger); - when(mFeatureFlags.isQuickAccessWalletEnabled()).thenReturn(true); when(mQuickAccessWalletClient.getServiceLabel()).thenReturn(LABEL); when(mQuickAccessWalletClient.isWalletFeatureAvailable()).thenReturn(true); when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(true); @@ -158,8 +154,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { mKeyguardStateController, mPackageManager, mSecureSettings, - mController, - mFeatureFlags); + mController); } @Test @@ -167,12 +162,6 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { assertFalse(mTile.newTileState().handlesLongClick); } - @Test - public void testIsAvailable_featureFlagIsOff() { - when(mFeatureFlags.isQuickAccessWalletEnabled()).thenReturn(false); - assertFalse(mTile.isAvailable()); - } - @Test public void testWalletServiceUnavailable_recreateWalletClient() { when(mQuickAccessWalletClient.isWalletServiceAvailable()).thenReturn(false);