PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Fingerprint settings to biometrics/fingerprint

Browse Source 
Bug: 110589286

Test: make -j56 RunSettingsRoboTests
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL still works
Test: adb shell am start -a android.settings.FINGERPRINT_SETUP still works
Change-Id: If33b557137cae7b57e4a0e906ee95032bc589436
This commit is contained in:
Kevin Chyn
2018-06-25 16:50:52 -07:00
parent fde790bf2c
commit 871e55fc54
44 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
AndroidManifest.xml
View File

@@ -1590,11 +1590,11 @@
android:windowSoftInputMode="stateHidden|adjustResize"
android:theme="@style/GlifTheme.Light"/>
<activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>
<activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
<activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".fingerprint.FingerprintEnrollFinish" android:exported="false"/>
<activity android:name=".fingerprint.FingerprintEnrollIntroduction"
<activity android:name=".biometrics.fingerprint.FingerprintSettings" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroduction"
android:exported="true"
android:theme="@style/GlifTheme.Light">
<intent-filter>
@@ -1603,10 +1603,10 @@
</intent-filter>
</activity>
<activity android:name=".fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
<activity android:name=".fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
<activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollIntroduction"
android:exported="true"
android:permission="android.permission.MANAGE_FINGERPRINT"
android:theme="@style/GlifTheme.Light">
@@ -1616,7 +1616,7 @@
</intent-filter>
</activity>
<activity android:name=".fingerprint.FingerprintSuggestionActivity"
<activity android:name=".biometrics.fingerprint.FingerprintSuggestionActivity"
android:exported="true"
android:permission="android.permission.MANAGE_FINGERPRINT"
android:icon="@drawable/ic_suggestion_fingerprint"
@@ -1691,7 +1691,7 @@
<meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
</activity>
<activity android:name=".fingerprint.FingerprintEnrollSuggestionActivity"
<activity android:name=".biometrics.fingerprint.FingerprintEnrollSuggestionActivity"
android:icon="@drawable/ic_suggestion_fingerprint">
<intent-filter android:priority="2">
<action android:name="android.intent.action.MAIN" />

2
res/layout/fingerprint_enroll_find_sensor_graphic.xml
View File

@@ -28,7 +28,7 @@
android:src="@drawable/fingerprint_sensor_location"
android:scaleType="centerInside"/>
<com.android.settings.fingerprint.FingerprintLocationAnimationView
<com.android.settings.biometrics.fingerprint.FingerprintLocationAnimationView
android:id="@+id/fingerprint_sensor_location_animation"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

1
src/com/android/settings/fingerprint/OWNERS → src/com/android/settings/biometrics/OWNERS
View File

@@ -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

2
src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java → src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintEnrollBase.java → src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java → src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -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;

4
src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java → src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintEnrollFinish.java → src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java → src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java → src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java → src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.fingerprint;
package com.android.settings.biometrics.fingerprint;
import android.content.Context;

2
src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java → src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java
View File

@@ -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

2
src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java → src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java → src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java → src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java → src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintSettings.java → src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.fingerprint;
package com.android.settings.biometrics.fingerprint;
import android.app.Activity;

2
src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java → src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java → src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/FingerprintUiHelper.java → src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java → src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java
View File

@@ -14,7 +14,7 @@
* limitations under the License
*/
package com.android.settings.fingerprint;
package com.android.settings.biometrics.fingerprint;
import android.content.Intent;

2
src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java → src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java → src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
View File

@@ -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;

2
src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java → src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
View File

@@ -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;

4
src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
View File

@@ -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;

4
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -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;

2
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -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.

2
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -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;

4
src/com/android/settings/security/SecuritySettings.java
View File

@@ -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;

2
tests/robotests/assets/grandfather_not_implementing_indexable
View File

@@ -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

6
tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java → tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
View File

@@ -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;

2
tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java → tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
View File

@@ -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;

2
tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java → tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
View File

@@ -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;