Merge "Add light reveal for auth from aod" into sc-dev am: 30d9c2d2de (71f60627) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -321,6 +321,7 @@ public class UdfpsController implements DozeReceiver, HbmCallback {
		mSensorProps = findFirstUdfps();
		// At least one UDFPS sensor exists
		checkArgument(mSensorProps != null);
		mStatusBar.setSensorRect(getSensorLocation());

		mCoreLayoutParams = new WindowManager.LayoutParams(
		// TODO(b/152419866): Use the UDFPS window type when it becomes available.
		@@ -367,7 +368,8 @@ public class UdfpsController implements DozeReceiver, HbmCallback {
		*/
		public RectF getSensorLocation() {
		// This is currently used to calculate the amount of space available for notifications
		// on lockscreen. Keyguard is only shown in portrait mode for now, so this will need to
		// on lockscreen and for the udfps light reveal animation on keyguard.
		// Keyguard is only shown in portrait mode for now, so this will need to
		// be updated if that ever changes.
		return new RectF(mSensorProps.sensorLocationX - mSensorProps.sensorRadius,
		mSensorProps.sensorLocationY - mSensorProps.sensorRadius,

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

+25 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,31 @@ object LiftReveal : LightRevealEffect {
		}
		}

		class CircleReveal(
		/** X-value of the circle center of the reveal. */
		val centerX: Float,
		/** Y-value of the circle center of the reveal. */
		val centerY: Float,
		/** Radius of initial state of circle reveal */
		val startRadius: Float,
		/** Radius of end state of circle reveal */
		val endRadius: Float
		) : LightRevealEffect {
		override fun setRevealAmountOnScrim(amount: Float, scrim: LightRevealScrim) {
		val interpolatedAmount = Interpolators.FAST_OUT_SLOW_IN.getInterpolation(amount)
		val fadeAmount =
		LightRevealEffect.getPercentPastThreshold(interpolatedAmount, 0.75f)
		val radius = startRadius + ((endRadius - startRadius) * interpolatedAmount)
		scrim.revealGradientEndColorAlpha = 1f - fadeAmount
		scrim.setRevealGradientBounds(
		centerX - radius /* left */,
		centerY - radius /* top */,
		centerX + radius /* right */,
		centerY + radius /* bottom */
		)
		}
		}

		class PowerButtonReveal(
		/** Approximate Y-value of the center of the power button on the physical device. */
		val powerButtonY: Float

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

+47 −10

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static android.app.StatusBarManager.WindowType;
		import static android.app.StatusBarManager.WindowVisibleState;
		import static android.app.StatusBarManager.windowStateToString;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY;
		import static android.hardware.biometrics.BiometricSourceType.FINGERPRINT;
		import static android.view.InsetsState.ITYPE_STATUS_BAR;
		import static android.view.InsetsState.containsType;
		import static android.view.WindowInsetsController.APPEARANCE_LOW_PROFILE_BARS;
		@@ -46,6 +47,7 @@ import static com.android.systemui.statusbar.phone.BarTransitions.MODE_WARNING;
		import static com.android.systemui.statusbar.phone.BarTransitions.TransitionMode;
		import static com.android.wm.shell.bubbles.BubbleController.TASKBAR_CHANGED_BROADCAST;

		import android.animation.ValueAnimator;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.ActivityManager;
		@@ -74,6 +76,7 @@ import android.content.pm.ResolveInfo;
		import android.content.res.Configuration;
		import android.graphics.Point;
		import android.graphics.PointF;
		import android.graphics.RectF;
		import android.media.AudioAttributes;
		import android.metrics.LogMaker;
		import android.net.Uri;
		@@ -179,6 +182,7 @@ import com.android.systemui.settings.brightness.BrightnessSlider;
		import com.android.systemui.shared.plugins.PluginManager;
		import com.android.systemui.statusbar.AutoHideUiElement;
		import com.android.systemui.statusbar.BackDropView;
		import com.android.systemui.statusbar.CircleReveal;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.CrossFadeHelper;
		import com.android.systemui.statusbar.FeatureFlags;
		@@ -382,6 +386,8 @@ public class StatusBar extends SystemUI implements DemoMode,
		private ChargingRippleView mChargingRipple;
		private WiredChargingRippleController mChargingRippleAnimationController;
		private PowerButtonReveal mPowerButtonReveal;
		private CircleReveal mCircleReveal;
		private ValueAnimator mCircleRevealAnimator = ValueAnimator.ofFloat(0f, 1f);

		private final Object mQueueLock = new Object();

		@@ -1206,7 +1212,9 @@ public class StatusBar extends SystemUI implements DemoMode,
		mLightRevealScrim = mNotificationShadeWindowView.findViewById(R.id.light_reveal_scrim);
		mChargingRippleAnimationController.setViewHost(mNotificationShadeWindowView);

		if (mFeatureFlags.useNewLockscreenAnimations() && mDozeParameters.getAlwaysOn()) {

		if (mFeatureFlags.useNewLockscreenAnimations()
		&& (mDozeParameters.getAlwaysOn() \|\| mDozeParameters.isQuickPickupEnabled())) {
		mLightRevealScrim.setVisibility(View.VISIBLE);
		mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE);
		} else {
		@@ -3353,6 +3361,9 @@ public class StatusBar extends SystemUI implements DemoMode,
		mNotificationPanelViewController.fadeOut(0, FADE_KEYGUARD_DURATION_PULSING,
		()-> {
		hideKeyguard();
		if (shouldShowCircleReveal()) {
		startCircleReveal();
		}
		mStatusBarKeyguardViewManager.onKeyguardFadedAway();
		}).start();
		}
		@@ -3666,15 +3677,16 @@ public class StatusBar extends SystemUI implements DemoMode,
		updateQsExpansionEnabled();
		mKeyguardViewMediator.setDozing(mDozing);

		final boolean usePowerButtonEffect =
		(isDozing && mWakefulnessLifecycle.getLastSleepReason()
		if (!isDozing && shouldShowCircleReveal()) {
		startCircleReveal();
		} else if ((isDozing && mWakefulnessLifecycle.getLastSleepReason()
		== PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON)
		\|\| (!isDozing && mWakefulnessLifecycle.getLastWakeReason()
		== PowerManager.WAKE_REASON_POWER_BUTTON);

		mLightRevealScrim.setRevealEffect(usePowerButtonEffect
		? mPowerButtonReveal
		: LiftReveal.INSTANCE);
		== PowerManager.WAKE_REASON_POWER_BUTTON)) {
		mLightRevealScrim.setRevealEffect(mPowerButtonReveal);
		} else if (!mCircleRevealAnimator.isRunning()) {
		mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE);
		}

		mNotificationsController.requestNotificationUpdate("onDozingChanged");
		updateDozingState();
		@@ -3684,6 +3696,22 @@ public class StatusBar extends SystemUI implements DemoMode,
		Trace.endSection();
		}

		private void startCircleReveal() {
		mLightRevealScrim.setRevealEffect(mCircleReveal);
		mCircleRevealAnimator.cancel();
		mCircleRevealAnimator.addUpdateListener(animation ->
		mLightRevealScrim.setRevealAmount(
		(float) mCircleRevealAnimator.getAnimatedValue()));
		mCircleRevealAnimator.setDuration(900);
		mCircleRevealAnimator.start();
		}

		private boolean shouldShowCircleReveal() {
		return mCircleReveal != null && !mCircleRevealAnimator.isRunning()
		&& mKeyguardUpdateMonitor.isUdfpsEnrolled()
		&& mBiometricUnlockController.getBiometricType() == FINGERPRINT;
		}

		private void updateKeyguardState() {
		mKeyguardStateController.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(),
		mStatusBarKeyguardViewManager.isOccluded());
		@@ -4170,6 +4198,15 @@ public class StatusBar extends SystemUI implements DemoMode,
		mBiometricUnlockController.getBiometricType());
		}

		/**
		* Set the location of the sensor on UDFPS if existent.
		*/
		public void setSensorRect(RectF rect) {
		final float startRadius = (rect.right - rect.left) / 2f;
		mCircleReveal = new CircleReveal(rect.centerX(), rect.centerY(),
		startRadius, rect.centerY() - startRadius);
		}

		@VisibleForTesting
		public void updateScrimController() {
		Trace.beginSection("StatusBar#updateScrimController");