Merge "Face auth low-light mitigation" (2c4282de) · Commits · e / os / android_frameworks_base

packages/SystemUI/res-keyguard/drawable/face_auth_wallpaper.png

0 → 100644

+692 KiB

Loading image diff...

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import android.hardware.SensorManager;
		import android.hardware.SensorPrivacyManager;
		import android.hardware.display.ColorDisplayManager;
		import android.hardware.display.DisplayManager;
		import android.hardware.face.FaceManager;
		import android.media.AudioManager;
		import android.media.MediaRouter2Manager;
		import android.media.session.MediaSessionManager;
		@@ -166,6 +167,14 @@ public class SystemServicesModule {
		ServiceManager.checkService(DreamService.DREAM_SERVICE));
		}

		@Provides
		@SysUISingleton
		@Nullable
		static FaceManager provideFaceManager(Context context) {
		return context.getSystemService(FaceManager.class);

		}

		@Provides
		@SysUISingleton
		static IPackageManager provideIPackageManager() {

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

+0 −25

Original line number	Diff line number	Diff line
		@@ -16,21 +16,14 @@

		package com.android.systemui.dagger;

		import android.annotation.Nullable;
		import android.content.Context;
		import android.content.pm.PackageManager;

		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.BootCompleteCache;
		import com.android.systemui.BootCompleteCacheImpl;
		import com.android.systemui.assist.AssistModule;
		import com.android.systemui.demomode.dagger.DemoModeModule;
		import com.android.systemui.doze.dagger.DozeComponent;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.fragments.FragmentService;
		import com.android.systemui.log.dagger.LogModule;
		import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.settings.dagger.SettingsModule;
		import com.android.systemui.stackdivider.Divider;
		@@ -41,12 +34,10 @@ 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.notification.row.dagger.NotificationShelfComponent;
		import com.android.systemui.statusbar.phone.KeyguardLiftController;
		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.util.concurrency.ConcurrencyModule;
		import com.android.systemui.util.sensors.AsyncSensorManager;
		import com.android.systemui.util.sensors.SensorModule;
		import com.android.systemui.util.settings.SettingsUtilModule;
		import com.android.systemui.util.time.SystemClock;
		@@ -87,22 +78,6 @@ public abstract class SystemUIModule {
		public abstract ContextComponentHelper bindComponentHelper(
		ContextComponentResolver componentHelper);

		@SysUISingleton
		@Provides
		@Nullable
		static KeyguardLiftController provideKeyguardLiftController(
		Context context,
		StatusBarStateController statusBarStateController,
		AsyncSensorManager asyncSensorManager,
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		DumpManager dumpManager) {
		if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {
		return null;
		}
		return new KeyguardLiftController(statusBarStateController, asyncSensorManager,
		keyguardUpdateMonitor, dumpManager);
		}

		/** */
		@Binds
		public abstract NotificationRowBinder bindNotificationRowBinder(

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

0 → 100644

+193 −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.keyguard

		import android.animation.Animator
		import android.animation.AnimatorListenerAdapter
		import android.animation.ValueAnimator
		import android.content.res.Resources
		import android.database.ContentObserver
		import android.graphics.Bitmap
		import android.graphics.BitmapFactory
		import android.graphics.Color
		import android.graphics.drawable.ColorDrawable
		import android.hardware.biometrics.BiometricSourceType
		import android.os.Handler
		import android.provider.Settings.System.SCREEN_BRIGHTNESS_FLOAT
		import android.util.MathUtils
		import android.view.View
		import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
		import android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
		import com.android.internal.annotations.VisibleForTesting
		import com.android.keyguard.KeyguardUpdateMonitor
		import com.android.keyguard.KeyguardUpdateMonitorCallback
		import com.android.systemui.Dumpable
		import com.android.systemui.R
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.statusbar.NotificationShadeWindowController
		import com.android.systemui.util.settings.GlobalSettings
		import com.android.systemui.util.settings.SystemSettings
		import java.io.FileDescriptor
		import java.io.PrintWriter
		import java.lang.Float.max
		import java.util.concurrent.TimeUnit

		val DEFAULT_ANIMATION_DURATION = TimeUnit.SECONDS.toMillis(4)
		val MAX_SCREEN_BRIGHTNESS = 100 // 0..100
		val MAX_SCRIM_OPACTY = 50 // 0..100
		val DEFAULT_USE_FACE_WALLPAPER = false

		/**
		* This class is responsible for ramping up the display brightness (and white overlay) in order
		* to mitigate low light conditions when running face auth without an IR camera.
		*/
		@SysUISingleton
		open class FaceAuthScreenBrightnessController(
		private val notificationShadeWindowController: NotificationShadeWindowController,
		private val keyguardUpdateMonitor: KeyguardUpdateMonitor,
		private val resources: Resources,
		private val globalSettings: GlobalSettings,
		private val systemSettings: SystemSettings,
		private val mainHandler: Handler,
		private val dumpManager: DumpManager
		) : Dumpable {

		private var userDefinedBrightness: Float = 1f
		@VisibleForTesting
		var useFaceAuthWallpaper = globalSettings
		.getInt("sysui.use_face_auth_wallpaper", if (DEFAULT_USE_FACE_WALLPAPER) 1 else 0) == 1
		private val brightnessAnimationDuration = globalSettings
		.getLong("sysui.face_brightness_anim_duration", DEFAULT_ANIMATION_DURATION)
		private val maxScreenBrightness = globalSettings
		.getInt("sysui.face_max_brightness", MAX_SCREEN_BRIGHTNESS) / 100f
		private val maxScrimOpacity = globalSettings
		.getInt("sysui.face_max_scrim_opacity", MAX_SCRIM_OPACTY) / 100f
		private val keyguardUpdateCallback = object : KeyguardUpdateMonitorCallback() {
		override fun onBiometricRunningStateChanged(
		running: Boolean,
		biometricSourceType: BiometricSourceType?
		) {
		if (biometricSourceType != BiometricSourceType.FACE) {
		return
		}
		// TODO enable only when receiving a low-light error
		overridingBrightness = running
		}
		}
		private lateinit var whiteOverlay: View
		private var brightnessAnimator: ValueAnimator? = null
		private var overridingBrightness = false
		set(value) {
		if (field == value) {
		return
		}
		field = value
		brightnessAnimator?.cancel()

		if (!value) {
		notificationShadeWindowController.setFaceAuthDisplayBrightness(BRIGHTNESS_OVERRIDE_NONE)
		if (whiteOverlay.alpha > 0) {
		brightnessAnimator = createAnimator(whiteOverlay.alpha, 0f).apply {
		duration = 200
		addUpdateListener {
		whiteOverlay.alpha = it.animatedValue as Float
		}
		addListener(object : AnimatorListenerAdapter() {
		override fun onAnimationEnd(animation: Animator?) {
		whiteOverlay.visibility = View.INVISIBLE
		brightnessAnimator = null
		}
		})
		start()
		}
		}
		return
		}

		val targetBrightness = max(maxScreenBrightness, userDefinedBrightness)
		whiteOverlay.visibility = View.VISIBLE
		brightnessAnimator = createAnimator(0f, 1f).apply {
		duration = brightnessAnimationDuration
		addUpdateListener {
		val progress = it.animatedValue as Float
		val brightnessProgress = MathUtils.constrainedMap(
		userDefinedBrightness, targetBrightness, 0f, 0.5f, progress)
		val scrimProgress = MathUtils.constrainedMap(
		0f, maxScrimOpacity, 0.5f, 1f, progress)
		notificationShadeWindowController.setFaceAuthDisplayBrightness(brightnessProgress)
		whiteOverlay.alpha = scrimProgress
		}
		addListener(object : AnimatorListenerAdapter() {
		override fun onAnimationEnd(animation: Animator?) {
		brightnessAnimator = null
		}
		})
		start()
		}
		}

		@VisibleForTesting
		open fun createAnimator(start: Float, end: Float) = ValueAnimator.ofFloat(start, end)

		/**
		* Returns a bitmap that should be used by the lock screen as a wallpaper, if face auth requires
		* a secure wallpaper.
		*/
		var faceAuthWallpaper: Bitmap? = null
		get() {
		val user = KeyguardUpdateMonitor.getCurrentUser()
		if (useFaceAuthWallpaper && keyguardUpdateMonitor.isFaceAuthEnabledForUser(user)) {
		val options = BitmapFactory.Options().apply {
		inScaled = false
		}
		return BitmapFactory.decodeResource(resources, R.drawable.face_auth_wallpaper, options)
		}
		return null
		}
		private set

		fun attach(overlayView: View) {
		whiteOverlay = overlayView
		whiteOverlay.focusable = FLAG_NOT_FOCUSABLE
		whiteOverlay.background = ColorDrawable(Color.WHITE)
		whiteOverlay.isEnabled = false
		whiteOverlay.alpha = 0f
		whiteOverlay.visibility = View.INVISIBLE

		dumpManager.registerDumpable(this.javaClass.name, this)
		keyguardUpdateMonitor.registerCallback(keyguardUpdateCallback)
		systemSettings.registerContentObserver(SCREEN_BRIGHTNESS_FLOAT,
		object : ContentObserver(mainHandler) {
		override fun onChange(selfChange: Boolean) {
		userDefinedBrightness = systemSettings.getFloat(SCREEN_BRIGHTNESS_FLOAT)
		}
		})
		userDefinedBrightness = systemSettings.getFloat(SCREEN_BRIGHTNESS_FLOAT)
		}

		override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<out String>) {
		pw.apply {
		println("overridingBrightness: $overridingBrightness")
		println("useFaceAuthWallpaper: $useFaceAuthWallpaper")
		println("brightnessAnimator: $brightnessAnimator")
		println("brightnessAnimationDuration: $brightnessAnimationDuration")
		println("maxScreenBrightness: $maxScreenBrightness")
		println("userDefinedBrightness: $userDefinedBrightness")
		}
		}
		}
		No newline at end of file

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+60 −0

Original line number	Diff line number	Diff line
		@@ -16,8 +16,13 @@

		package com.android.systemui.keyguard.dagger;

		import android.annotation.Nullable;
		import android.app.trust.TrustManager;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.content.res.Resources;
		import android.hardware.face.FaceManager;
		import android.os.Handler;
		import android.os.PowerManager;

		import com.android.internal.widget.LockPatternUtils;
		@@ -25,16 +30,25 @@ import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardViewController;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.keyguard.DismissCallbackRegistry;
		import com.android.systemui.keyguard.FaceAuthScreenBrightnessController;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.navigationbar.NavigationModeController;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.phone.KeyguardLiftController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.util.DeviceConfigProxy;
		import com.android.systemui.util.InjectionInflationController;
		import com.android.systemui.util.sensors.AsyncSensorManager;
		import com.android.systemui.util.settings.GlobalSettings;
		import com.android.systemui.util.settings.SystemSettings;

		import java.util.Optional;
		import java.util.concurrent.Executor;

		import dagger.Lazy;
		@@ -82,4 +96,50 @@ public class KeyguardModule {
		navigationModeController,
		injectionInflationController);
		}

		@SysUISingleton
		@Provides
		@Nullable
		static KeyguardLiftController provideKeyguardLiftController(
		Context context,
		StatusBarStateController statusBarStateController,
		AsyncSensorManager asyncSensorManager,
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		DumpManager dumpManager) {
		if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {
		return null;
		}
		return new KeyguardLiftController(statusBarStateController, asyncSensorManager,
		keyguardUpdateMonitor, dumpManager);
		}

		@SysUISingleton
		@Provides
		static Optional<FaceAuthScreenBrightnessController> provideFaceAuthScreenBrightnessController(
		Context context,
		NotificationShadeWindowController notificationShadeWindowController,
		@Main Resources resources,
		Handler handler,
		@Nullable FaceManager faceManager,
		PackageManager packageManager,
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		GlobalSettings globalSetting,
		SystemSettings systemSettings,
		DumpManager dumpManager) {
		if (faceManager == null \|\| !packageManager.hasSystemFeature(PackageManager.FEATURE_FACE)) {
		return Optional.empty();
		}

		// Cameras that support "self illumination," via IR for example, don't need low light
		// environment mitigation.
		boolean needsLowLightMitigation = faceManager.getSensorProperties().stream()
		.anyMatch((properties) -> !properties.supportsSelfIllumination);
		if (!needsLowLightMitigation) {
		return Optional.empty();
		}

		return Optional.of(new FaceAuthScreenBrightnessController(
		notificationShadeWindowController, keyguardUpdateMonitor, resources,
		globalSetting, systemSettings, handler, dumpManager));
		}
		}