Merge "Remove feature flag for split shade" into sc-v2-dev (ad502315) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/flags.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -24,9 +24,6 @@

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

		<!-- b/171917882 -->
		<bool name="flag_notification_twocolumn">false</bool>

		<!-- AOD/Lockscreen alternate layout -->
		<bool name="flag_keyguard_layout">true</bool>

packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import androidx.annotation.VisibleForTesting
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.media.dagger.MediaModule.KEYGUARD
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.statusbar.FeatureFlags
		import com.android.systemui.statusbar.NotificationLockscreenUserManager
		import com.android.systemui.statusbar.StatusBarState
		import com.android.systemui.statusbar.SysuiStatusBarStateController
		@@ -45,7 +44,6 @@ class KeyguardMediaController @Inject constructor(
		private val bypassController: KeyguardBypassController,
		private val statusBarStateController: SysuiStatusBarStateController,
		private val notifLockscreenUserManager: NotificationLockscreenUserManager,
		private val featureFlags: FeatureFlags,
		private val context: Context,
		configurationController: ConfigurationController
		) {
		@@ -73,7 +71,7 @@ class KeyguardMediaController @Inject constructor(
		}

		private fun updateResources() {
		useSplitShade = Utils.shouldUseSplitNotificationShade(featureFlags, context.resources)
		useSplitShade = Utils.shouldUseSplitNotificationShade(context.resources)
		}

		@VisibleForTesting

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.qs.customize.QSCustomizerController;
		import com.android.systemui.qs.dagger.QSFragmentComponent;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
		import com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer;
		@@ -113,7 +112,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		private QuickQSPanelController mQuickQSPanelController;
		private QSCustomizerController mQSCustomizerController;
		private ScrollListener mScrollListener;
		private FeatureFlags mFeatureFlags;
		/**
		* When true, QS will translate from outside the screen. It will be clipped with parallax
		* otherwise.
		@@ -137,7 +135,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		StatusBarStateController statusBarStateController, CommandQueue commandQueue,
		QSDetailDisplayer qsDetailDisplayer, @Named(QS_PANEL) MediaHost qsMediaHost,
		@Named(QUICK_QS_PANEL) MediaHost qqsMediaHost,
		QSFragmentComponent.Factory qsComponentFactory, FeatureFlags featureFlags,
		QSFragmentComponent.Factory qsComponentFactory,
		FalsingManager falsingManager) {
		mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler;
		mInjectionInflater = injectionInflater;
		@@ -148,7 +146,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		mQsComponentFactory = qsComponentFactory;
		commandQueue.observe(getLifecycle(), this);
		mHost = qsTileHost;
		mFeatureFlags = featureFlags;
		mFalsingManager = falsingManager;
		mStatusBarStateController = statusBarStateController;
		}
		@@ -377,7 +374,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		!mQsDisabled && expandVisually ? View.VISIBLE : View.INVISIBLE);
		mQsDragHandler.setVisibility((mQsExpanded \|\| !keyguardShowing \|\| mHeaderAnimating
		\|\| mShowCollapsedOnKeyguard)
		&& Utils.shouldUseSplitNotificationShade(mFeatureFlags, getResources())
		&& Utils.shouldUseSplitNotificationShade(getResources())
		? View.VISIBLE
		: View.GONE);
		}

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import com.android.systemui.qs.dagger.QSScope;
		import com.android.systemui.qs.logging.QSLogger;
		import com.android.systemui.settings.brightness.BrightnessController;
		import com.android.systemui.settings.brightness.BrightnessSlider;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.statusbar.policy.BrightnessMirrorController;
		import com.android.systemui.tuner.TunerService;

		@@ -102,10 +101,9 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> {
		QSTileRevealController.Factory qsTileRevealControllerFactory,
		DumpManager dumpManager, MetricsLogger metricsLogger, UiEventLogger uiEventLogger,
		QSLogger qsLogger, BrightnessController.Factory brightnessControllerFactory,
		BrightnessSlider.Factory brightnessSliderFactory, FalsingManager falsingManager,
		FeatureFlags featureFlags) {
		BrightnessSlider.Factory brightnessSliderFactory, FalsingManager falsingManager) {
		super(view, qstileHost, qsCustomizerController, usingMediaPlayer, mediaHost,
		metricsLogger, uiEventLogger, qsLogger, dumpManager, featureFlags);
		metricsLogger, uiEventLogger, qsLogger, dumpManager);
		mQsSecurityFooter = qsSecurityFooter;
		mTunerService = tunerService;
		mQsCustomizerController = qsCustomizerController;

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

+3 −7

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import com.android.systemui.plugins.qs.QSTileView;
		import com.android.systemui.qs.customize.QSCustomizerController;
		import com.android.systemui.qs.external.CustomTile;
		import com.android.systemui.qs.logging.QSLogger;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.util.Utils;
		import com.android.systemui.util.ViewController;
		import com.android.systemui.util.animation.DisappearParameters;
		@@ -67,7 +66,6 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		private final UiEventLogger mUiEventLogger;
		private final QSLogger mQSLogger;
		private final DumpManager mDumpManager;
		private final FeatureFlags mFeatureFlags;
		protected final ArrayList<TileRecord> mRecords = new ArrayList<>();
		protected boolean mShouldUseSplitNotificationShade;

		@@ -85,7 +83,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		@Override
		public void onConfigurationChange(Configuration newConfig) {
		mShouldUseSplitNotificationShade =
		Utils.shouldUseSplitNotificationShade(mFeatureFlags, getResources());
		Utils.shouldUseSplitNotificationShade(getResources());
		if (newConfig.orientation != mLastOrientation) {
		mLastOrientation = newConfig.orientation;
		onScreenRotated();
		@@ -118,8 +116,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		MetricsLogger metricsLogger,
		UiEventLogger uiEventLogger,
		QSLogger qsLogger,
		DumpManager dumpManager,
		FeatureFlags featureFlags
		DumpManager dumpManager
		) {
		super(view);
		mHost = host;
		@@ -130,9 +127,8 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		mUiEventLogger = uiEventLogger;
		mQSLogger = qsLogger;
		mDumpManager = dumpManager;
		mFeatureFlags = featureFlags;
		mShouldUseSplitNotificationShade =
		Utils.shouldUseSplitNotificationShade(mFeatureFlags, getResources());
		Utils.shouldUseSplitNotificationShade(getResources());
		}

		@Override