Merge "Remove blur from power menu" into sc-dev (4a9037a8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.GlobalActions.GlobalActionsManager;
		import com.android.systemui.plugins.GlobalActionsPanelPlugin;
		import com.android.systemui.statusbar.NotificationShadeDepthController;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		@@ -103,7 +102,6 @@ public class GlobalActionsDialog extends GlobalActionsDialogLite

		private final LockPatternUtils mLockPatternUtils;
		private final KeyguardStateController mKeyguardStateController;
		private final NotificationShadeDepthController mDepthController;
		private final SysUiState mSysUiState;
		private final ActivityStarter mActivityStarter;
		private final SysuiColorExtractor mSysuiColorExtractor;
		@@ -164,7 +162,6 @@ public class GlobalActionsDialog extends GlobalActionsDialogLite
		IActivityManager iActivityManager,
		@Nullable TelecomManager telecomManager,
		MetricsLogger metricsLogger,
		NotificationShadeDepthController depthController,
		SysuiColorExtractor colorExtractor,
		IStatusBarService statusBarService,
		NotificationShadeWindowController notificationShadeWindowController,
		@@ -196,7 +193,6 @@ public class GlobalActionsDialog extends GlobalActionsDialogLite
		iActivityManager,
		telecomManager,
		metricsLogger,
		depthController,
		colorExtractor,
		statusBarService,
		notificationShadeWindowController,
		@@ -212,7 +208,6 @@ public class GlobalActionsDialog extends GlobalActionsDialogLite

		mLockPatternUtils = lockPatternUtils;
		mKeyguardStateController = keyguardStateController;
		mDepthController = depthController;
		mSysuiColorExtractor = colorExtractor;
		mStatusBarService = statusBarService;
		mNotificationShadeWindowController = notificationShadeWindowController;
		@@ -267,9 +262,8 @@ public class GlobalActionsDialog extends GlobalActionsDialogLite
		protected ActionsDialogLite createDialog() {
		initDialogItems();

		mDepthController.setShowingHomeControls(true);
		ActionsDialog dialog = new ActionsDialog(getContext(), mAdapter, mOverflowAdapter,
		this::getWalletViewController, mDepthController, mSysuiColorExtractor,
		this::getWalletViewController, mSysuiColorExtractor,
		mStatusBarService, mNotificationShadeWindowController,
		mSysUiState, this::onRotate, isKeyguardShowing(), mPowerAdapter, getEventLogger(),
		getStatusBar());
		@@ -336,16 +330,15 @@ public class GlobalActionsDialog extends GlobalActionsDialogLite

		ActionsDialog(Context context, MyAdapter adapter, MyOverflowAdapter overflowAdapter,
		Provider<GlobalActionsPanelPlugin.PanelViewController> walletFactory,
		NotificationShadeDepthController depthController,
		SysuiColorExtractor sysuiColorExtractor, IStatusBarService statusBarService,
		NotificationShadeWindowController notificationShadeWindowController,
		SysUiState sysuiState, Runnable onRotateCallback, boolean keyguardShowing,
		MyPowerOptionsAdapter powerAdapter, UiEventLogger uiEventLogger,
		StatusBar statusBar) {
		super(context, com.android.systemui.R.style.Theme_SystemUI_Dialog_GlobalActions,
		adapter, overflowAdapter, depthController, sysuiColorExtractor,
		statusBarService, notificationShadeWindowController, sysuiState,
		onRotateCallback, keyguardShowing, powerAdapter, uiEventLogger, null,
		adapter, overflowAdapter, sysuiColorExtractor, statusBarService,
		notificationShadeWindowController, sysuiState, onRotateCallback,
		keyguardShowing, powerAdapter, uiEventLogger, null,
		statusBar);
		mWalletFactory = walletFactory;

		@@ -494,8 +487,6 @@ public class GlobalActionsDialog extends GlobalActionsDialogLite
		float animatedValue = animation.getAnimatedFraction();
		int alpha = (int) (animatedValue * mScrimAlpha * 255);
		mBackgroundDrawable.setAlpha(alpha);
		mDepthController.updateGlobalDialogVisibility(animatedValue,
		mGlobalActionsLayout);
		});

		ObjectAnimator xAnimator =

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+1 −13

Original line number	Diff line number	Diff line
		@@ -119,7 +119,6 @@ import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.GlobalActions.GlobalActionsManager;
		import com.android.systemui.plugins.GlobalActionsPanelPlugin;
		import com.android.systemui.scrim.ScrimDrawable;
		import com.android.systemui.statusbar.NotificationShadeDepthController;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		@@ -190,7 +189,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		private final TelecomManager mTelecomManager;
		private final MetricsLogger mMetricsLogger;
		private final UiEventLogger mUiEventLogger;
		private final NotificationShadeDepthController mDepthController;
		private final SysUiState mSysUiState;
		private final GlobalActionsInfoProvider mInfoProvider;

		@@ -329,7 +327,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		IActivityManager iActivityManager,
		@Nullable TelecomManager telecomManager,
		MetricsLogger metricsLogger,
		NotificationShadeDepthController depthController,
		SysuiColorExtractor colorExtractor,
		IStatusBarService statusBarService,
		NotificationShadeWindowController notificationShadeWindowController,
		@@ -362,7 +359,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		mMetricsLogger = metricsLogger;
		mUiEventLogger = uiEventLogger;
		mInfoProvider = infoProvider;
		mDepthController = depthController;
		mSysuiColorExtractor = colorExtractor;
		mStatusBarService = statusBarService;
		mNotificationShadeWindowController = notificationShadeWindowController;
		@@ -652,11 +648,9 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		protected ActionsDialogLite createDialog() {
		initDialogItems();

		mDepthController.setShowingHomeControls(false);
		ActionsDialogLite dialog = new ActionsDialogLite(mContext,
		com.android.systemui.R.style.Theme_SystemUI_Dialog_GlobalActionsLite,
		mAdapter, mOverflowAdapter,
		mDepthController, mSysuiColorExtractor,
		mAdapter, mOverflowAdapter, mSysuiColorExtractor,
		mStatusBarService, mNotificationShadeWindowController,
		mSysUiState, this::onRotate, mKeyguardShowing, mPowerAdapter, mUiEventLogger,
		mInfoProvider, mStatusBar);
		@@ -2125,7 +2119,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		protected boolean mShowing;
		protected float mScrimAlpha;
		protected final NotificationShadeWindowController mNotificationShadeWindowController;
		protected final NotificationShadeDepthController mDepthController;
		protected final SysUiState mSysUiState;
		private ListPopupWindow mOverflowPopup;
		private Dialog mPowerOptionsDialog;
		@@ -2181,7 +2174,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene

		ActionsDialogLite(Context context, int themeRes, MyAdapter adapter,
		MyOverflowAdapter overflowAdapter,
		NotificationShadeDepthController depthController,
		SysuiColorExtractor sysuiColorExtractor, IStatusBarService statusBarService,
		NotificationShadeWindowController notificationShadeWindowController,
		SysUiState sysuiState, Runnable onRotateCallback, boolean keyguardShowing,
		@@ -2192,7 +2184,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		mAdapter = adapter;
		mOverflowAdapter = overflowAdapter;
		mPowerOptionsAdapter = powerAdapter;
		mDepthController = depthController;
		mColorExtractor = sysuiColorExtractor;
		mStatusBarService = statusBarService;
		mNotificationShadeWindowController = notificationShadeWindowController;
		@@ -2409,7 +2400,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		float animatedValue = animation.getAnimatedFraction();
		int alpha = (int) (animatedValue * mScrimAlpha * 255);
		mBackgroundDrawable.setAlpha(alpha);
		mDepthController.updateGlobalDialogVisibility(animatedValue, mGlobalActionsLayout);
		});

		ObjectAnimator xAnimator =
		@@ -2439,7 +2429,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		float animatedValue = 1f - animation.getAnimatedFraction();
		int alpha = (int) (animatedValue * mScrimAlpha * 255);
		mBackgroundDrawable.setAlpha(alpha);
		mDepthController.updateGlobalDialogVisibility(animatedValue, mGlobalActionsLayout);
		});

		float xOffset = mGlobalActionsLayout.getAnimationOffsetX();
		@@ -2476,7 +2465,6 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		dismissOverflow(true);
		dismissPowerOptions(true);
		mNotificationShadeWindowController.setRequestTopUi(false, TAG);
		mDepthController.updateGlobalDialogVisibility(0, null /* view */);
		mSysUiState.setFlag(SYSUI_STATE_GLOBAL_ACTIONS_SHOWING, false)
		.commitUpdate(mContext.getDisplayId());
		super.dismiss();

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt

+1 −17

Original line number	Diff line number	Diff line
		@@ -92,10 +92,6 @@ class NotificationShadeDepthController @Inject constructor(
		var shadeSpring = DepthAnimation()
		var shadeAnimation = DepthAnimation()

		@VisibleForTesting
		var globalActionsSpring = DepthAnimation()
		var showingHomeControls: Boolean = false

		@VisibleForTesting
		var brightnessMirrorSpring = DepthAnimation()
		var brightnessMirrorVisible: Boolean = false
		@@ -186,13 +182,7 @@ class NotificationShadeDepthController @Inject constructor(
		}
		}

		// Home controls have black background, this means that we should not have blur when they
		// are fully visible, otherwise we'll enter Client Composition unnecessarily.
		var globalActionsRadius = globalActionsSpring.radius
		if (showingHomeControls) {
		globalActionsRadius = 0
		}
		var blur = max(shadeRadius.toInt(), globalActionsRadius)
		var blur = shadeRadius.toInt()

		// Make blur be 0 if it is necessary to stop blur effect.
		if (scrimsVisible \|\| !blurUtils.supportsBlursOnWindows()) {
		@@ -271,7 +261,6 @@ class NotificationShadeDepthController @Inject constructor(
		if (isDozing) {
		shadeSpring.finishIfRunning()
		shadeAnimation.finishIfRunning()
		globalActionsSpring.finishIfRunning()
		brightnessMirrorSpring.finishIfRunning()
		}
		}
		@@ -427,17 +416,12 @@ class NotificationShadeDepthController @Inject constructor(
		!keyguardStateController.isKeyguardFadingAway
		}

		fun updateGlobalDialogVisibility(visibility: Float, dialogView: View?) {
		globalActionsSpring.animateTo(blurUtils.blurRadiusOfRatio(visibility), dialogView)
		}

		override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) {
		IndentingPrintWriter(pw, " ").let {
		it.println("StatusBarWindowBlurController:")
		it.increaseIndent()
		it.println("shadeRadius: ${shadeSpring.radius}")
		it.println("shadeAnimation: ${shadeAnimation.radius}")
		it.println("globalActionsRadius: ${globalActionsSpring.radius}")
		it.println("brightnessMirrorRadius: ${brightnessMirrorSpring.radius}")
		it.println("wakeAndUnlockBlur: $wakeAndUnlockBlurRadius")
		it.println("ignoreShadeBlurUntilHidden: $ignoreShadeBlurUntilHidden")

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.GlobalActions;
		import com.android.systemui.settings.UserContextProvider;
		import com.android.systemui.statusbar.NotificationShadeDepthController;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		@@ -99,7 +98,6 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase {
		@Mock private TrustManager mTrustManager;
		@Mock private IActivityManager mActivityManager;
		@Mock private MetricsLogger mMetricsLogger;
		@Mock private NotificationShadeDepthController mDepthController;
		@Mock private SysuiColorExtractor mColorExtractor;
		@Mock private IStatusBarService mStatusBarService;
		@Mock private NotificationShadeWindowController mNotificationShadeWindowController;
		@@ -147,7 +145,6 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase {
		mActivityManager,
		null,
		mMetricsLogger,
		mDepthController,
		mColorExtractor,
		mStatusBarService,
		mNotificationShadeWindowController,

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.GlobalActions;
		import com.android.systemui.plugins.GlobalActionsPanelPlugin;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.NotificationShadeDepthController;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		@@ -111,7 +110,6 @@ public class GlobalActionsDialogTest extends SysuiTestCase {
		@Mock private TrustManager mTrustManager;
		@Mock private IActivityManager mActivityManager;
		@Mock private MetricsLogger mMetricsLogger;
		@Mock private NotificationShadeDepthController mDepthController;
		@Mock private SysuiColorExtractor mColorExtractor;
		@Mock private IStatusBarService mStatusBarService;
		@Mock private NotificationShadeWindowController mNotificationShadeWindowController;
		@@ -161,7 +159,6 @@ public class GlobalActionsDialogTest extends SysuiTestCase {
		mActivityManager,
		null,
		mMetricsLogger,
		mDepthController,
		mColorExtractor,
		mStatusBarService,
		mNotificationShadeWindowController,