Merge "Inline most FeatureFlags methods." (d71cc858) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.systemui.demomode.dagger.DemoModeModule;
		import com.android.systemui.doze.dagger.DozeComponent;
		import com.android.systemui.dreams.dagger.DreamModule;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.FlagsModule;
		import com.android.systemui.fragments.FragmentService;
		import com.android.systemui.log.dagger.LogModule;
		@@ -52,6 +51,7 @@ import com.android.systemui.shared.system.smartspace.SmartspaceTransitionControl
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.notification.NotifPipelineFlags;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.collection.NotifPipeline;
		import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;
		@@ -206,14 +206,15 @@ public abstract class SystemUIModule {
		NotificationInterruptStateProvider interruptionStateProvider,
		ZenModeController zenModeController, NotificationLockscreenUserManager notifUserManager,
		NotificationGroupManagerLegacy groupManager, NotificationEntryManager entryManager,
		NotifPipeline notifPipeline, SysUiState sysUiState, FeatureFlags featureFlags,
		DumpManager dumpManager, @Main Executor sysuiMainExecutor) {
		NotifPipeline notifPipeline, SysUiState sysUiState,
		NotifPipelineFlags notifPipelineFlags, DumpManager dumpManager,
		@Main Executor sysuiMainExecutor) {
		return Optional.ofNullable(BubblesManager.create(context, bubblesOptional,
		notificationShadeWindowController, statusBarStateController, shadeController,
		configurationController, statusBarService, notificationManager,
		visibilityProvider,
		interruptionStateProvider, zenModeController, notifUserManager,
		groupManager, entryManager, notifPipeline, sysUiState, featureFlags, dumpManager,
		sysuiMainExecutor));
		groupManager, entryManager, notifPipeline, sysUiState, notifPipelineFlags,
		dumpManager, sysuiMainExecutor));
		}
		}

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

+0 −76

Original line number	Diff line number	Diff line
		@@ -22,80 +22,4 @@ package com.android.systemui.flags;
		* See {@link Flags} for instructions on defining new flags.
		*/
		public interface FeatureFlags extends FlagReader {
		default boolean isNewNotifPipelineRenderingEnabled() {
		return isEnabled(Flags.NEW_NOTIFICATION_PIPELINE_RENDERING);
		}

		/** */
		default boolean useNewLockscreenAnimations() {
		return isEnabled(Flags.LOCKSCREEN_ANIMATIONS);
		}

		default boolean isPeopleTileEnabled() {
		return isEnabled(Flags.PEOPLE_TILE);
		}

		default boolean isMonetEnabled() {
		return isEnabled(Flags.MONET);
		}

		default boolean isPMLiteEnabled() {
		return isEnabled(Flags.POWER_MENU_LITE);
		}

		default boolean isChargingRippleEnabled() {
		return isEnabled(Flags.CHARGING_RIPPLE);
		}

		default boolean isOngoingCallStatusBarChipEnabled() {
		return isEnabled(Flags.ONGOING_CALL_STATUS_BAR_CHIP);
		}

		default boolean isOngoingCallInImmersiveEnabled() {
		return isOngoingCallStatusBarChipEnabled() && isEnabled(Flags.ONGOING_CALL_IN_IMMERSIVE);
		}

		default boolean isOngoingCallInImmersiveChipTapEnabled() {
		return isOngoingCallInImmersiveEnabled()
		&& isEnabled(Flags.ONGOING_CALL_IN_IMMERSIVE_CHIP_TAP);
		}

		default boolean isSmartspaceEnabled() {
		return isEnabled(Flags.SMARTSPACE);
		}

		default boolean isSmartspaceDedupingEnabled() {
		return isSmartspaceEnabled() && isEnabled(Flags.SMARTSPACE_DEDUPING);
		}

		default boolean isNewKeyguardSwipeAnimationEnabled() {
		return isEnabled(Flags.NEW_UNLOCK_SWIPE_ANIMATION);
		}

		default boolean isKeyguardQsUserDetailsShortcutEnabled() {
		return isEnabled(Flags.QS_USER_DETAIL_SHORTCUT);
		}

		default boolean isSmartSpaceSharedElementTransitionEnabled() {
		return isEnabled(Flags.SMARTSPACE_SHARED_ELEMENT_TRANSITION_ENABLED);
		}

		/** Whether or not to use the provider model behavior for the status bar icons */
		default boolean isCombinedStatusBarSignalIconsEnabled() {
		return isEnabled(Flags.COMBINED_STATUS_BAR_SIGNAL_ICONS);
		}

		/**
		* Use the new version of the user switcher
		*/
		default boolean useNewUserSwitcher() {
		return isEnabled(Flags.NEW_USER_SWITCHER);
		}

		/**
		* Use the new single view QS headers
		*/
		default boolean useCombinedQSHeaders() {
		return isEnabled(Flags.COMBINED_QS_HEADERS);
		}
		}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import com.android.keyguard.KeyguardViewController
		import com.android.systemui.animation.Interpolators
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.shared.system.smartspace.SmartspaceTransitionController
		import com.android.systemui.statusbar.policy.KeyguardStateController
		import dagger.Lazy
		@@ -354,7 +355,7 @@ class KeyguardUnlockAnimationController @Inject constructor(
		* keyguard visible.
		*/
		private fun updateKeyguardViewMediatorIfThresholdsReached() {
		if (!featureFlags.isNewKeyguardSwipeAnimationEnabled) {
		if (!featureFlags.isEnabled(Flags.NEW_UNLOCK_SWIPE_ANIMATION)) {
		return
		}

		@@ -410,7 +411,7 @@ class KeyguardUnlockAnimationController @Inject constructor(
		* know if it needs to do something as a result.
		*/
		private fun updateSmartSpaceTransition() {
		if (!featureFlags.isSmartSpaceSharedElementTransitionEnabled) {
		if (!featureFlags.isEnabled(Flags.SMARTSPACE_SHARED_ELEMENT_TRANSITION_ENABLED)) {
		return
		}

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.demomode.DemoMode;
		import com.android.systemui.demomode.DemoModeController;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.privacy.OngoingPrivacyChip;
		import com.android.systemui.privacy.PrivacyChipEvent;
		@@ -218,7 +219,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader

		List<String> rssiIgnoredSlots;

		if (mFeatureFlags.isCombinedStatusBarSignalIconsEnabled()) {
		if (mFeatureFlags.isEnabled(Flags.COMBINED_STATUS_BAR_SIGNAL_ICONS)) {
		rssiIgnoredSlots = List.of(
		getResources().getString(com.android.internal.R.string.status_bar_no_calling),
		getResources().getString(com.android.internal.R.string.status_bar_call_strength)
		@@ -230,7 +231,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader
		}

		mView.onAttach(mIconManager, mQSExpansionPathInterpolator, rssiIgnoredSlots,
		mInsetsProvider, mFeatureFlags.useCombinedQSHeaders());
		mInsetsProvider, mFeatureFlags.isEnabled(Flags.COMBINED_QS_HEADERS));

		mDemoModeController.addCallback(mDemoModeReceiver);

packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.statusbar.connectivity.IconState;
		import com.android.systemui.statusbar.connectivity.MobileDataIndicators;
		@@ -219,7 +220,7 @@ public class QSCarrierGroupController {
		CarrierConfigTracker carrierConfigTracker, FeatureFlags featureFlags,
		SlotIndexResolver slotIndexResolver) {

		if (featureFlags.isCombinedStatusBarSignalIconsEnabled()) {
		if (featureFlags.isEnabled(Flags.COMBINED_STATUS_BAR_SIGNAL_ICONS)) {
		mProviderModel = true;
		} else {
		mProviderModel = false;