Merge changes Ieefdc9d1,Id2dad12b

* changes:
  Move fingerprint package to sdk 26
  Update DeleteFingerprintDialogTest to sdk 26

tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java

@@ -17,6 +17,10 @@
 package com.android.settings.fingerprint;
 
 
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.app.Dialog;
 import android.hardware.fingerprint.Fingerprint;
 
@@ -26,6 +30,7 @@ import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsF
         .DeleteFingerprintDialog;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowFragment;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,27 +40,25 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.FragmentTestUtil;
 
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         shadows = {
-                ShadowEventLogWriter.class
+                ShadowEventLogWriter.class,
+                ShadowFragment.class
         })
 public class DeleteFingerprintDialogTest {
 
-    @Mock
-    private FingerprintSettingsFragment mTarget;
     @Mock
     private Fingerprint mFingerprint;
-    private DeleteFingerprintDialog mFragment;
+    @Mock
+    private FingerprintSettingsFragment mTarget;
 
+    private DeleteFingerprintDialog mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mFragment = DeleteFingerprintDialog.newInstance(mFingerprint, mTarget);
+        mFragment = spy(DeleteFingerprintDialog.newInstance(mFingerprint, mTarget));
     }
 
     @Test

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java

@@ -57,7 +57,7 @@ import java.util.concurrent.TimeUnit;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = Config.NEWEST_SDK,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowUtils.class,
                 ShadowVibrator.class

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java

@@ -55,7 +55,7 @@ import org.robolectric.shadows.ShadowActivity.IntentForResult;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java

@@ -38,7 +38,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class FingerprintEnrollSuggestionActivityTest {
 
     @Mock

tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java

@@ -37,7 +37,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class FingerprintLocationAnimationVideoViewTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java

@@ -39,7 +39,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class FingerprintPreferenceTest {
 
     @Mock

tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java

@@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowKeyguardManager;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowEventLogWriter.class,
                 ShadowLockPatternUtils.class,

tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java

@@ -47,7 +47,7 @@ import org.robolectric.shadows.ShadowAlertDialog;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,

tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java

@@ -60,7 +60,7 @@ import org.robolectric.shadows.ShadowKeyguardManager;
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
+        sdk = TestConfig.SDK_VERSION_O,
         shadows = {
                 ShadowEventLogWriter.class,
                 ShadowFingerprintManager.class,

tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 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.testutils.shadow;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * Override the {@link #setTargetFragment(Fragment, int)} to skip an illegal state exception
+ * in SDK 26. SDK 26 requires that the target fragment be in the same {@link FragmentManager} as
+ * the current {@link Fragment}. This is infeasible with our current framework.
+ */
+@Implements(
+        value = Fragment.class,
+        minSdk = 26
+)
+public class ShadowFragment {
+
+    private Fragment mTargetFragment;
+
+    @Implementation
+    public void setTargetFragment(Fragment fragment, int requestCode) {
+        mTargetFragment = fragment;
+    }
+
+    @Implementation
+    final public Fragment getTargetFragment() {
+        return mTargetFragment;
+    }
+}