Merge "Add blurs to WAKE_AND_UNLOCK" (4e489961) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.ServiceManager;
		import android.util.DisplayMetrics;
		import android.view.Choreographer;
		import android.view.IWindowManager;
		import android.view.LayoutInflater;

		@@ -203,4 +204,11 @@ public class DependencyProvider {
		public ViewMediatorCallback providesViewMediatorCallback(KeyguardViewMediator viewMediator) {
		return viewMediator.getViewMediatorCallback();
		}

		/** */
		@Singleton
		@Provides
		public Choreographer providesChoreographer() {
		return Choreographer.getInstance();
		}
		}

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

+16 −8

Original line number	Diff line number	Diff line
		@@ -19,14 +19,13 @@ package com.android.systemui.dagger;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.content.res.Resources;
		import android.view.Choreographer;

		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.BootCompleteCache;
		import com.android.systemui.BootCompleteCacheImpl;
		import com.android.systemui.DumpController;
		import com.android.systemui.assist.AssistModule;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.log.dagger.LogModule;
		import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		@@ -34,18 +33,22 @@ import com.android.systemui.recents.Recents;
		import com.android.systemui.stackdivider.Divider;
		import com.android.systemui.statusbar.BlurUtils;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.StatusBarWindowBlurController;
		import com.android.systemui.statusbar.NotificationShadeWindowBlurController;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;
		import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;
		import com.android.systemui.statusbar.notification.dagger.NotificationsModule;
		import com.android.systemui.statusbar.notification.people.PeopleHubModule;
		import com.android.systemui.statusbar.notification.row.dagger.ExpandableNotificationRowComponent;
		import com.android.systemui.statusbar.notification.row.dagger.NotificationRowComponent;
		import com.android.systemui.statusbar.phone.BiometricUnlockController;
		import com.android.systemui.statusbar.phone.KeyguardLiftController;
		import com.android.systemui.statusbar.phone.NotificationShadeWindowController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.util.concurrency.ConcurrencyModule;
		import com.android.systemui.util.sensors.AsyncSensorManager;
		import com.android.systemui.util.time.SystemClock;
		@@ -100,11 +103,16 @@ public abstract class SystemUIModule {
		@Singleton
		@Provides
		@Nullable
		static StatusBarWindowBlurController providesBlurController(BlurUtils blurUtils,
		@Main Resources resources, SysuiStatusBarStateController statusBarStateController,
		DumpController dumpController) {
		return blurUtils.supportsBlursOnWindows() ? new StatusBarWindowBlurController(resources,
		statusBarStateController, blurUtils, dumpController) : null;
		static NotificationShadeWindowBlurController providesBlurController(BlurUtils blurUtils,
		SysuiStatusBarStateController statusBarStateController,
		DumpController dumpController, BiometricUnlockController biometricUnlockController,
		KeyguardStateController keyguardStateController,
		NotificationShadeWindowController notificationShadeWindowController,
		Choreographer choreographer) {
		return blurUtils.supportsBlursOnWindows() ? new NotificationShadeWindowBlurController(
		statusBarStateController, blurUtils, biometricUnlockController,
		keyguardStateController, notificationShadeWindowController, choreographer,
		dumpController) : null;
		}

		/** */

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ import com.android.systemui.plugins.GlobalActions.GlobalActionsManager;
		import com.android.systemui.plugins.GlobalActionsPanelPlugin;
		import com.android.systemui.statusbar.BlurUtils;
		import com.android.systemui.statusbar.phone.NotificationShadeWindowController;
		import com.android.systemui.statusbar.phone.ScrimController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.util.EmergencyDialerConstants;
		@@ -1668,7 +1669,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		}
		if (mBackgroundDrawable == null) {
		mBackgroundDrawable = new ScrimDrawable();
		mScrimAlpha = 0.8f;
		mScrimAlpha = ScrimController.BUSY_SCRIM_ALPHA;
		}
		getWindow().setBackgroundDrawable(mBackgroundDrawable);
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks
		}

		if (mBlurUtils.supportsBlursOnWindows()) {
		background.setAlpha((int) (ScrimController.GRADIENT_SCRIM_ALPHA_BUSY * 255));
		background.setAlpha((int) (ScrimController.BUSY_SCRIM_ALPHA * 255));
		mBlurUtils.applyBlur(d.getWindow().getDecorView().getViewRootImpl(),
		mBlurUtils.radiusForRatio(1));
		} else {

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

0 → 100644

+176 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar

		import android.animation.Animator
		import android.animation.AnimatorListenerAdapter
		import android.animation.ValueAnimator
		import android.view.Choreographer
		import android.view.View
		import com.android.internal.util.IndentingPrintWriter
		import com.android.systemui.DumpController
		import com.android.systemui.Dumpable
		import com.android.systemui.Interpolators
		import com.android.systemui.statusbar.phone.BiometricUnlockController
		import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK
		import com.android.systemui.statusbar.phone.NotificationShadeWindowController
		import com.android.systemui.statusbar.phone.PanelExpansionListener
		import com.android.systemui.statusbar.policy.KeyguardStateController
		import java.io.FileDescriptor
		import java.io.PrintWriter
		import javax.inject.Inject
		import javax.inject.Singleton
		import kotlin.math.max

		/**
		* Controller responsible for statusbar window blur.
		*/
		@Singleton
		class NotificationShadeWindowBlurController @Inject constructor(
		private val statusBarStateController: SysuiStatusBarStateController,
		private val blurUtils: BlurUtils,
		private val biometricUnlockController: BiometricUnlockController,
		private val keyguardStateController: KeyguardStateController,
		private val notificationShadeWindowController: NotificationShadeWindowController,
		private val choreographer: Choreographer,
		dumpController: DumpController
		) : PanelExpansionListener, Dumpable {
		companion object {
		private const val WAKE_UP_ANIMATION_ENABLED = true
		private const val SHADE_BLUR_ENABLED = true
		}

		lateinit var root: View
		private var keyguardAnimator: Animator? = null
		private var notificationAnimator: Animator? = null
		private var updateScheduled: Boolean = false
		private var shadeExpansion = 1.0f
		private var shadeBlurRadius = 0
		set(value) {
		if (field == value) return
		field = value
		scheduleUpdate()
		}
		private var wakeAndUnlockBlurRadius = 0
		set(value) {
		if (field == value) return
		field = value
		scheduleUpdate()
		}
		private var incomingNotificationBlurRadius = 0
		set(value) {
		if (field == value) return
		field = value
		scheduleUpdate()
		}

		/**
		* Callback that updates the window blur value and is called only once per frame.
		*/
		private val updateBlurCallback = Choreographer.FrameCallback {
		updateScheduled = false

		var notificationBlur = 0
		if (statusBarStateController.state == StatusBarState.KEYGUARD) {
		notificationBlur = (incomingNotificationBlurRadius * shadeExpansion).toInt()
		}

		val blur = max(max(shadeBlurRadius, wakeAndUnlockBlurRadius), notificationBlur)
		blurUtils.applyBlur(root.viewRootImpl, blur)
		}

		/**
		* Animate blurs when unlocking.
		*/
		private val keyguardStateCallback = object : KeyguardStateController.Callback {
		override fun onKeyguardFadingAwayChanged() {
		if (!keyguardStateController.isKeyguardFadingAway \|\|
		biometricUnlockController.mode != MODE_WAKE_AND_UNLOCK) {
		return
		}

		keyguardAnimator?.cancel()
		keyguardAnimator = ValueAnimator.ofFloat(1f, 0f).apply {
		duration = keyguardStateController.keyguardFadingAwayDuration
		startDelay = keyguardStateController.keyguardFadingAwayDelay
		interpolator = Interpolators.DECELERATE_QUINT
		addUpdateListener { animation: ValueAnimator ->
		wakeAndUnlockBlurRadius =
		blurUtils.radiusForRatio(animation.animatedValue as Float)
		}
		addListener(object : AnimatorListenerAdapter() {
		override fun onAnimationEnd(animation: Animator?) {
		keyguardAnimator = null
		scheduleUpdate()
		}
		})
		start()
		}
		}

		override fun onKeyguardShowingChanged() {
		if (keyguardStateController.isShowing) {
		keyguardAnimator?.cancel()
		notificationAnimator?.cancel()
		}
		}
		}

		init {
		dumpController.registerDumpable(this)
		if (WAKE_UP_ANIMATION_ENABLED) {
		keyguardStateController.addCallback(keyguardStateCallback)
		}
		}

		/**
		* Update blurs when pulling down the shade
		*/
		override fun onPanelExpansionChanged(expansion: Float, tracking: Boolean) {
		if (!SHADE_BLUR_ENABLED) {
		return
		}

		var newBlur = 0
		if (statusBarStateController.state == StatusBarState.SHADE) {
		newBlur = blurUtils.radiusForRatio(expansion)
		}

		if (shadeBlurRadius == newBlur) {
		return
		}
		shadeBlurRadius = newBlur
		scheduleUpdate()
		}

		private fun scheduleUpdate() {
		if (updateScheduled) {
		return
		}
		updateScheduled = true
		choreographer.postFrameCallback(updateBlurCallback)
		}

		override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) {
		IndentingPrintWriter(pw, " ").use {
		it.println("StatusBarWindowBlurController:")
		it.increaseIndent()
		it.println("shadeBlurRadius: $shadeBlurRadius")
		it.println("wakeAndUnlockBlur: $wakeAndUnlockBlurRadius")
		}
		}
		}
		No newline at end of file