Merge "Fix icon touch dialog in Enrolling page" into udc-dev (3e41d936) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics2/data/repository/AccessibilityRepository.java

deleted100644 → 0

+0 −77

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.settings.biometrics2.data.repository;

		import android.view.View;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.accessibility.AccessibilityManager;

		import androidx.annotation.NonNull;

		/**
		* This repository is used to call all APIs in {@link AccessibilityManager}
		*/
		public class AccessibilityRepository {

		private final AccessibilityManager mAccessibilityManager;

		public AccessibilityRepository(AccessibilityManager accessibilityManager) {
		mAccessibilityManager = accessibilityManager;
		}

		/**
		* Requests interruption of the accessibility feedback from all accessibility services.
		*/
		public void interrupt() {
		mAccessibilityManager.interrupt();
		}

		/**
		* Returns if the {@link AccessibilityManager} is enabled.
		*
		* @return True if this {@link AccessibilityManager} is enabled, false otherwise.
		*/
		public boolean isEnabled() {
		return mAccessibilityManager.isEnabled();
		}

		/**
		* Sends an {@link AccessibilityEvent}.
		*
		* @param event The event to send.
		*
		* @throws IllegalStateException if accessibility is not enabled.
		*
		* <strong>Note:</strong> The preferred mechanism for sending custom accessibility
		* events is through calling
		* {@link android.view.ViewParent#requestSendAccessibilityEvent(View, AccessibilityEvent)}
		* instead of this method to allow predecessors to augment/filter events sent by
		* their descendants.
		*/
		public void sendAccessibilityEvent(@NonNull AccessibilityEvent event) {
		mAccessibilityManager.sendAccessibilityEvent(event);
		}

		/**
		* Returns if the touch exploration in the system is enabled.
		*
		* @return True if touch exploration is enabled, false otherwise.
		*/
		public boolean isTouchExplorationEnabled() {
		return mAccessibilityManager.isTouchExplorationEnabled();
		}
		}

src/com/android/settings/biometrics2/data/repository/VibratorRepository.java

deleted100644 → 0

+0 −43

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.settings.biometrics2.data.repository;

		import android.annotation.NonNull;
		import android.os.VibrationAttributes;
		import android.os.VibrationEffect;
		import android.os.Vibrator;

		/**
		* This repository is used to call all APIs in {@link Vibrator}
		*/
		public class VibratorRepository {

		private final Vibrator mVibrator;

		public VibratorRepository(Vibrator vibrator) {
		mVibrator = vibrator;
		}

		/**
		* Like {@link #vibrate(VibrationEffect, VibrationAttributes)}, but allows the
		* caller to specify the vibration is owned by someone else and set a reason for vibration.
		*/
		public void vibrate(int uid, String opPkg, @NonNull VibrationEffect vibe,
		String reason, @NonNull VibrationAttributes attributes) {
		mVibrator.vibrate(uid, opPkg, vibe, reason, attributes);
		}
		}

src/com/android/settings/biometrics2/factory/BiometricsRepositoryProvider.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -21,9 +21,7 @@ import android.app.Application;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.settings.biometrics2.data.repository.AccessibilityRepository;
		import com.android.settings.biometrics2.data.repository.FingerprintRepository;
		import com.android.settings.biometrics2.data.repository.VibratorRepository;

		/**
		* Interface for BiometricsRepositoryProvider
		@@ -35,16 +33,4 @@ public interface BiometricsRepositoryProvider {
		*/
		@Nullable
		FingerprintRepository getFingerprintRepository(@NonNull Application application);

		/**
		* Get VibtatorRepository
		*/
		@Nullable
		VibratorRepository getVibratorRepository(@NonNull Application application);

		/**
		* Get AccessibilityRepository
		*/
		@Nullable
		AccessibilityRepository getAccessibilityRepository(@NonNull Application application);
		}

src/com/android/settings/biometrics2/factory/BiometricsRepositoryProviderImpl.java

+0 −51

Original line number	Diff line number	Diff line
		@@ -18,16 +18,12 @@ package com.android.settings.biometrics2.factory;

		import android.app.Application;
		import android.hardware.fingerprint.FingerprintManager;
		import android.os.Vibrator;
		import android.view.accessibility.AccessibilityManager;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.settings.Utils;
		import com.android.settings.biometrics2.data.repository.AccessibilityRepository;
		import com.android.settings.biometrics2.data.repository.FingerprintRepository;
		import com.android.settings.biometrics2.data.repository.VibratorRepository;

		/**
		* Implementation for BiometricsRepositoryProvider
		@@ -35,8 +31,6 @@ import com.android.settings.biometrics2.data.repository.VibratorRepository;
		public class BiometricsRepositoryProviderImpl implements BiometricsRepositoryProvider {

		private static volatile FingerprintRepository sFingerprintRepository;
		private static volatile VibratorRepository sVibratorRepository;
		private static volatile AccessibilityRepository sAccessibilityRepository;

		/**
		* Get FingerprintRepository
		@@ -58,49 +52,4 @@ public class BiometricsRepositoryProviderImpl implements BiometricsRepositoryPro
		}
		return sFingerprintRepository;
		}

		/**
		* Get VibratorRepository
		*/
		@Nullable
		@Override
		public VibratorRepository getVibratorRepository(@NonNull Application application) {

		final Vibrator vibrator = application.getSystemService(Vibrator.class);
		if (vibrator == null) {
		return null;
		}

		if (sVibratorRepository == null) {
		synchronized (VibratorRepository.class) {
		if (sVibratorRepository == null) {
		sVibratorRepository = new VibratorRepository(vibrator);
		}
		}
		}
		return sVibratorRepository;
		}

		/**
		* Get AccessibilityRepository
		*/
		@Nullable
		@Override
		public AccessibilityRepository getAccessibilityRepository(@NonNull Application application) {

		final AccessibilityManager accessibilityManager = application.getSystemService(
		AccessibilityManager.class);
		if (accessibilityManager == null) {
		return null;
		}

		if (sAccessibilityRepository == null) {
		synchronized (AccessibilityRepository.class) {
		if (sAccessibilityRepository == null) {
		sAccessibilityRepository = new AccessibilityRepository(accessibilityManager);
		}
		}
		}
		return sAccessibilityRepository;
		}
		}

src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java

+3 −8

Original line number	Diff line number	Diff line
		@@ -27,9 +27,7 @@ import androidx.lifecycle.viewmodel.CreationExtras;

		import com.android.internal.widget.LockPatternUtils;
		import com.android.settings.biometrics.fingerprint.FingerprintUpdater;
		import com.android.settings.biometrics2.data.repository.AccessibilityRepository;
		import com.android.settings.biometrics2.data.repository.FingerprintRepository;
		import com.android.settings.biometrics2.data.repository.VibratorRepository;
		import com.android.settings.biometrics2.ui.model.EnrollmentRequest;
		import com.android.settings.biometrics2.ui.viewmodel.AutoCredentialViewModel;
		import com.android.settings.biometrics2.ui.viewmodel.AutoCredentialViewModel.ChallengeGenerator;
		@@ -115,12 +113,9 @@ public class BiometricsViewModelFactory implements ViewModelProvider.Factory {
		final Integer userId = extras.get(USER_ID_KEY);
		final FingerprintRepository fingerprint = provider.getFingerprintRepository(
		application);
		final AccessibilityRepository accessibility = provider.getAccessibilityRepository(
		application);
		final VibratorRepository vibrator = provider.getVibratorRepository(application);
		if (fingerprint != null && accessibility != null && vibrator != null) {
		return (T) new FingerprintEnrollEnrollingViewModel(application, userId, fingerprint,
		accessibility, vibrator);
		if (fingerprint != null) {
		return (T) new FingerprintEnrollEnrollingViewModel(application, userId,
		fingerprint);
		}
		} else if (modelClass.isAssignableFrom(FingerprintEnrollFinishViewModel.class)) {
		final Integer userId = extras.get(USER_ID_KEY);