Snap for 10885733 from 22541cb0ee6e5d4200e9142983800a697e682ead to 24Q1-release (16e0ab9b) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/biometrics/src/com/android/systemui/biometrics/shared/model/BiometricModality.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.systemui.biometrics.shared.model

		import android.hardware.biometrics.BiometricAuthenticator

		/** Shadows [BiometricAuthenticator.Modality] for Kotlin use within SysUI. */
		/** Shadows [BiometricAuthenticator.Modality] for Kotlin use within SysUI and Settings. */
		enum class BiometricModality {
		None,
		Fingerprint,

packages/SystemUI/shared/biometrics/src/com/android/systemui/biometrics/shared/model/BiometricUserInfo.kt

+16 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.biometrics.shared.model

		/**

packages/SystemUI/shared/biometrics/src/com/android/systemui/biometrics/shared/model/FingerprintSensor.kt

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.biometrics.shared.model

		import android.hardware.fingerprint.FingerprintSensorPropertiesInternal

		/** Fingerprint sensor property. Represents [FingerprintSensorPropertiesInternal]. */
		data class FingerprintSensor(
		val sensorId: Int,
		val sensorStrength: SensorStrength,
		val maxEnrollmentsPerUser: Int,
		val sensorType: FingerprintSensorType
		)

		/** Convert [FingerprintSensorPropertiesInternal] to corresponding [FingerprintSensor] */
		fun FingerprintSensorPropertiesInternal.toFingerprintSensor(): FingerprintSensor {
		val sensorStrength: SensorStrength = this.sensorStrength.toSensorStrength()
		val sensorType: FingerprintSensorType = this.sensorType.toSensorType()
		return FingerprintSensor(this.sensorId, sensorStrength, this.maxEnrollmentsPerUser, sensorType)
		}

packages/SystemUI/shared/biometrics/src/com/android/systemui/biometrics/shared/model/UdfpsOverlayParams.kt

+16 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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.biometrics.shared.model

		import android.graphics.Rect

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -80,8 +80,8 @@ import androidx.core.math.MathUtils;
		import com.android.internal.accessibility.common.MagnificationConstants;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.graphics.SfVsyncFrameCallbackProvider;
		import com.android.systemui.res.R;
		import com.android.systemui.model.SysUiState;
		import com.android.systemui.res.R;
		import com.android.systemui.util.settings.SecureSettings;

		import java.io.PrintWriter;
		@@ -205,7 +205,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		private final Supplier<IWindowSession> mGlobalWindowSessionSupplier;
		private final SfVsyncFrameCallbackProvider mSfVsyncFrameProvider;
		private final MagnificationGestureDetector mGestureDetector;
		private final int mBounceEffectDuration;
		private int mBounceEffectDuration;
		private final Choreographer.FrameCallback mMirrorViewGeometryVsyncCallback;
		private Locale mLocale;
		private NumberFormat mPercentFormat;
		@@ -272,8 +272,8 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold

		setupMagnificationSizeScaleOptions();

		mBounceEffectDuration = mResources.getInteger(
		com.android.internal.R.integer.config_shortAnimTime);
		setBounceEffectDuration(mResources.getInteger(
		com.android.internal.R.integer.config_shortAnimTime));
		updateDimensions();

		final Size windowFrameSize = restoreMagnificationWindowFrameSizeIfPossible();
		@@ -1461,6 +1461,11 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
		mDragView.setColorFilter(filter);
		}

		@VisibleForTesting
		void setBounceEffectDuration(int duration) {
		mBounceEffectDuration = duration;
		}

		private void animateBounceEffect() {
		final ObjectAnimator scaleAnimator = ObjectAnimator.ofPropertyValuesHolder(mMirrorView,
		PropertyValuesHolder.ofFloat(View.SCALE_X, 1, mBounceEffectAnimationScale, 1),