diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7bbffc7813b..50ab8bb764a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1590,11 +1590,11 @@ android:windowSoftInputMode="stateHidden|adjustResize" android:theme="@style/GlifTheme.Light"/> - - - - - + + + + @@ -1603,10 +1603,10 @@ - - - - + + + @@ -1616,7 +1616,7 @@ - - diff --git a/res/layout/fingerprint_enroll_find_sensor_graphic.xml b/res/layout/fingerprint_enroll_find_sensor_graphic.xml index 1c6ab80adf8..069045783e3 100644 --- a/res/layout/fingerprint_enroll_find_sensor_graphic.xml +++ b/res/layout/fingerprint_enroll_find_sensor_graphic.xml @@ -28,7 +28,7 @@ android:src="@drawable/fingerprint_sensor_location" android:scaleType="centerInside"/> - diff --git a/src/com/android/settings/fingerprint/OWNERS b/src/com/android/settings/biometrics/OWNERS similarity index 53% rename from src/com/android/settings/fingerprint/OWNERS rename to src/com/android/settings/biometrics/OWNERS index 937b3030fd6..6332a46482d 100644 --- a/src/com/android/settings/fingerprint/OWNERS +++ b/src/com/android/settings/biometrics/OWNERS @@ -1,5 +1,6 @@ # Default reviewers for this and subdirectories. jaggies@google.com +kchyn@google.com yukl@google.com # Emergency approvers in case the above are not available \ No newline at end of file diff --git a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java similarity index 98% rename from src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java index 1fa59a2fb60..0b92326e8cb 100644 --- a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager.AuthenticationResult; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java similarity index 98% rename from src/com/android/settings/fingerprint/FingerprintEnrollBase.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java index 5a148d33432..a65ee8ca21f 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.annotation.Nullable; import android.content.Intent; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java similarity index 99% rename from src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index b87e61f8481..2b7a20b8da9 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.animation.Animator; import android.animation.ObjectAnimator; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java similarity index 98% rename from src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index e5729828cf1..bc01458284e 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; @@ -27,7 +27,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener; +import com.android.settings.biometrics.fingerprint.FingerprintEnrollSidecar.Listener; import com.android.settings.password.ChooseLockSettingsHelper; import androidx.annotation.Nullable; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java similarity index 98% rename from src/com/android/settings/fingerprint/FingerprintEnrollFinish.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java index 4bd438c7978..8b175ec7d31 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java similarity index 99% rename from src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index dd831219ad5..dfcdace76f4 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.app.admin.DevicePolicyManager; import android.content.ActivityNotFoundException; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java similarity index 99% rename from src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java index 7f7cb673241..af56310ccf0 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.annotation.Nullable; import android.app.Activity; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java similarity index 95% rename from src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java index 4a4d08d353e..fb2c668e33f 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.content.Context; diff --git a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java b/src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java similarity index 95% rename from src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java index 07ab99d17ca..8ce507e834c 100644 --- a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; /** * An abstraction for a view that contains an animation that shows the user diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java similarity index 99% rename from src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java index b988ab7763e..c79ed49a2b1 100644 --- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.content.ContentResolver; import android.content.Context; diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java similarity index 99% rename from src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java index 0812f2d1475..99d4ff902f3 100644 --- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java similarity index 96% rename from src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java index 68d2ade4dbf..23873f9cb2b 100644 --- a/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.content.Context; import android.os.UserHandle; diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java similarity index 98% rename from src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java index 381b8ebd150..25cd2f52e8f 100644 --- a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.annotation.Nullable; import android.hardware.fingerprint.Fingerprint; diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java similarity index 99% rename from src/com/android/settings/fingerprint/FingerprintSettings.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 0bd926d46cd..60e09d20dad 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.app.Activity; diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java similarity index 98% rename from src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java index 2839ee68a2f..e13e8ac6a98 100644 --- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.content.Context; import android.content.Intent; diff --git a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java similarity index 97% rename from src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java index fa6aeb42210..f5fe92b7bcd 100644 --- a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.app.admin.DevicePolicyManager; import android.content.Context; diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java similarity index 98% rename from src/com/android/settings/fingerprint/FingerprintUiHelper.java rename to src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java index 4a67ecd5c0b..012f80262a6 100644 --- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.CancellationSignal; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java similarity index 95% rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java index fbbf033aa3f..c2c4930a5e3 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.content.Intent; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java similarity index 98% rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java index 3a4c3f73cc8..d3acbeac293 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.app.Activity; import android.app.AlertDialog; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java similarity index 97% rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java index e81203fb7a6..c73417b83e9 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.content.Intent; import android.os.UserHandle; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java similarity index 99% rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java index 5656a27d540..c7c0bb46b50 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import android.app.Activity; import android.app.KeyguardManager; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index f71a6bc963d..1d58ed5ad1a 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java @@ -28,8 +28,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.Settings.NightDisplaySuggestionActivity; import com.android.settings.display.NightDisplayPreferenceController; -import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity; -import com.android.settings.fingerprint.FingerprintSuggestionActivity; +import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity; +import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity; import com.android.settings.notification.ZenOnboardingActivity; import com.android.settings.notification.ZenSuggestionActivity; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index b5fb8e9f9ad..68678dc427f 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -53,8 +53,8 @@ import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settings.fingerprint.FingerprintEnrollBase; -import com.android.settings.fingerprint.FingerprintEnrollFindSensor; +import com.android.settings.biometrics.fingerprint.FingerprintEnrollBase; +import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java index 3f2675029d0..74207cd5631 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java @@ -53,7 +53,7 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.InstrumentedFragment; -import com.android.settings.fingerprint.FingerprintUiHelper; +import com.android.settings.biometrics.fingerprint.FingerprintUiHelper; /** * Base fragment to be shared for PIN/Pattern/Password confirmation fragments. diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 4258d76b624..0540bbff11e 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -31,7 +31,7 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.SetupEncryptionInterstitial; import com.android.settings.SetupWizardUtils; -import com.android.settings.fingerprint.SetupFingerprintEnrollFindSensor; +import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor; import com.android.settings.utils.SettingsDividerItemDecoration; import com.android.setupwizardlib.GlifPreferenceLayout; diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index b5906184d14..30ac4025c83 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -29,8 +29,8 @@ import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.enterprise.EnterprisePrivacyPreferenceController; -import com.android.settings.fingerprint.FingerprintProfileStatusPreferenceController; -import com.android.settings.fingerprint.FingerprintStatusPreferenceController; +import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController; +import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController; import com.android.settings.location.LocationPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.security.trustagent.ManageTrustAgentsPreferenceController; diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable index 393fe61c490..45474e7096b 100644 --- a/tests/robotests/assets/grandfather_not_implementing_indexable +++ b/tests/robotests/assets/grandfather_not_implementing_indexable @@ -6,7 +6,7 @@ com.android.settings.accessibility.AccessibilitySettingsForSetupWizard com.android.settings.datausage.DataUsageList com.android.settings.vpn2.AppManagementFragment com.android.settings.vpn2.VpnSettings -com.android.settings.fingerprint.FingerprintSettings$FingerprintSettingsFragment +com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment com.android.settings.applications.ProcessStatsDetail com.android.settings.wifi.WifiInfo com.android.settings.applications.VrListenerSettings diff --git a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java similarity index 88% rename from tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java index d306d068d30..27729cf5728 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -23,8 +23,8 @@ import static org.mockito.Mockito.verify; import android.app.Dialog; import android.hardware.fingerprint.Fingerprint; -import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment; -import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment.DeleteFingerprintDialog; +import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment; +import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.DeleteFingerprintDialog; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowFragment; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index 8c8113be4cd..bee208fb71b 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java similarity index 99% rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 1fe09310e76..338b3c002cb 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java index 74d4b28a1b7..888b061022f 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java similarity index 97% rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java index 24eb1ad671c..e8b27a8446f 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java @@ -15,7 +15,7 @@ * */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java similarity index 94% rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java index f8984ab93d3..8c90cb7b2ce 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; @@ -25,7 +25,7 @@ import android.view.View; import android.widget.FrameLayout; import com.android.settings.R; -import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference; +import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java index 583428e6c0f..fe3f5b06df6 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java index e01ed3cf005..7fe114b6222 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java index ee47f2a036c..310674e3bc7 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static org.robolectric.RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java index 85d7ad8212a..38127ef22e2 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java index 9e62511d6b2..bbdb443d2f8 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static org.robolectric.RuntimeEnvironment.application; @@ -27,7 +27,7 @@ import android.view.View; import android.widget.Button; import com.android.settings.R; -import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper; +import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper; import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment; import com.android.settings.password.SetupSkipDialog; import com.android.settings.password.StorageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java index a6acf2773eb..38d9ce5ba71 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java +++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java @@ -28,8 +28,8 @@ import android.content.res.Resources; import com.android.settings.R; import com.android.settings.Settings; -import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity; -import com.android.settings.fingerprint.FingerprintSuggestionActivity; +import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity; +import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity; import com.android.settings.notification.ZenSuggestionActivity; import com.android.settings.support.NewDeviceIntroSuggestionActivity; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java similarity index 98% rename from tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java rename to tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java index b09d1bf116e..da25ac04999 100644 --- a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java +++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static android.support.test.InstrumentationRegistry.getTargetContext; import static android.support.test.espresso.Espresso.onView; diff --git a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java similarity index 98% rename from tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java rename to tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java index 235ba1e43f0..e937b7f85e6 100644 --- a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java +++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.fingerprint; +package com.android.settings.biometrics.fingerprint; import static org.mockito.Matchers.anyInt;