Merge "Remove flags for wallet and alarm" into sc-dev (12b7df48) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/flags.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -33,15 +33,11 @@
		<!-- People Tile flag -->
		<bool name="flag_conversations">false</bool>

		<bool name="flag_wallet">false</bool>

		<!-- The new animations to/from lockscreen and AOD! -->
		<bool name="flag_lockscreen_animations">false</bool>

		<bool name="flag_pm_lite">true</bool>

		<bool name="flag_alarm_tile">false</bool>

		<bool name="flag_charging_ripple">false</bool>

		<bool name="flag_ongoing_call_status_bar_chip">true</bool>

packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -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<QSTile.State>(
		@@ -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

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -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<QSTile.State> {
		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<QSTile.State> {
		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<QSTile.State> {

		@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;
		}

packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -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);
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -1126,11 +1126,8 @@ public class NotificationPanelViewController extends PanelViewController {
		mKeyguardBottomArea.setStatusBar(mStatusBar);
		mKeyguardBottomArea.setUserSetupComplete(mUserSetupComplete);
		mKeyguardBottomArea.setFalsingManager(mFalsingManager);

		if (mFeatureFlags.isQuickAccessWalletEnabled()) {
		mKeyguardBottomArea.initWallet(mQuickAccessWalletController);
		}
		}

		private void updateMaxDisplayedNotifications(boolean recompute) {
		if (recompute) {