Snap for 7455929 from 55d804ab71 to sc-v2-release

Change-Id: I47d1d8a213605bd42b721c54e75af897c7cb6070

AndroidManifest.xml

@@ -542,12 +542,12 @@
         <activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
                   android:exported="false"
                   android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
-                  android:theme="@style/Theme.AlertDialog" />
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
 
         <activity android:name=".network.telephony.DeleteEuiccSubscriptionDialogActivity"
                   android:exported="false"
                   android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
-                  android:theme="@style/Theme.AlertDialog" />
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
 
         <activity
             android:name="Settings$TetherSettingsActivity"
@@ -3786,14 +3786,14 @@
             android:exported="false"
             android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
             android:launchMode="singleInstance"
-            android:theme="@style/Theme.AlertDialog" />
+            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
 
         <activity
             android:name=".sim.DsdsDialogActivity"
             android:exported="false"
             android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
             android:launchMode="singleInstance"
-            android:theme="@style/Theme.AlertDialog" />
+            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
 
         <service android:name=".sim.SimNotificationService"
                  android:permission="android.permission.BIND_JOB_SERVICE" />

res/layout/preference_animated_image.xml

@@ -15,30 +15,31 @@
   limitations under the License.
   -->
 
-<FrameLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/settingslib_illustration_height"
-    android:clipToPadding="false"
+    android:gravity="center"
+    android:padding="@dimen/settingslib_illustration_padding"
+    android:orientation="vertical"
     android:importantForAccessibility="noHideDescendants">
 
     <ImageView
         android:id="@+id/animated_img"
-        android:layout_width="match_parent"
+        android:maxWidth="@dimen/settingslib_illustration_width"
-        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
-        android:layout_gravity="center"
+        android:layout_height="match_parent"
+        android:background="@drawable/protection_background"
         android:scaleType="fitCenter"
-        android:focusable="false"
-        android:clickable="false"
         android:adjustViewBounds="true"/>
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/lottie_view"
-        android:layout_width="412dp"
+        android:maxWidth="@dimen/settingslib_illustration_width"
-        android:layout_height="300dp"
+        android:layout_width="wrap_content"
-        android:layout_gravity="center"
+        android:layout_height="match_parent"
         android:background="@drawable/protection_background"
         android:scaleType="fitCenter"
         android:adjustViewBounds="true"
         android:clipToOutline="true"/>
-</FrameLayout>
+</LinearLayout>

res/values/arrays.xml

@@ -281,7 +281,6 @@
         <item>Do not verify</item>
         <item>Request certificate status</item>
         <item>Require certificate status</item>
-        <item>Require all non-trusted certificate statuses</item>
     </string-array>
 
     <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz prefer. -->

res/xml/connected_devices.xml

@@ -42,7 +42,6 @@
         android:icon="@drawable/ic_add_24dp"
         android:summary="@string/connected_device_add_device_summary"
         android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
-        settings:allowDividerAbove="true"
         settings:keywords="@string/keywords_add_bt_device"
         settings:userRestriction="no_config_bluetooth"
         settings:useAdminDisabledSummary="true"

src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java

@@ -80,7 +80,7 @@ public class ToggleColorInversionPreferenceFragment extends
         mHtmlDescription = getText(R.string.accessibility_display_inversion_preference_subtitle);
         mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
                 .authority(getPrefContext().getPackageName())
-                .appendPath(String.valueOf(R.drawable.accessibility_color_inversion_banner))
+                .appendPath(String.valueOf(R.raw.accessibility_color_inversion_banner))
                 .build();
         final List<String> enableServiceFeatureKeys = new ArrayList<>(/* initialCapacity= */ 1);
         enableServiceFeatureKeys.add(ENABLED);

src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java

@@ -89,7 +89,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         mPackageName = getString(R.string.accessibility_screen_magnification_title);
         mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
                 .authority(getPrefContext().getPackageName())
-                .appendPath(String.valueOf(R.drawable.accessibility_magnification_banner))
+                .appendPath(String.valueOf(R.raw.accessibility_magnification_banner))
                 .build();
         mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
             removeDialog(DialogEnums.EDIT_SHORTCUT);

src/com/android/settings/password/BiometricFragment.java

@@ -47,7 +47,6 @@ public class BiometricFragment extends InstrumentedFragment {
     private int mUserId;
 
     // Created/Initialized once and retained
-    private PromptInfo mPromptInfo;
     private BiometricPrompt mBiometricPrompt;
     private CancellationSignal mCancellationSignal;
 
@@ -127,7 +126,7 @@ public class BiometricFragment extends InstrumentedFragment {
         final Bundle bundle = getArguments();
         final PromptInfo promptInfo = bundle.getParcelable(KEY_PROMPT_INFO);
 
-        final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(getContext())
+        mBiometricPrompt = new BiometricPrompt.Builder(getContext())
                 .setTitle(promptInfo.getTitle())
                 .setUseDefaultTitle() // use default title if title is null/empty
                 .setDeviceCredentialAllowed(true)
@@ -140,13 +139,19 @@ public class BiometricFragment extends InstrumentedFragment {
                 .setConfirmationRequired(promptInfo.isConfirmationRequested())
                 .setDisallowBiometricsIfPolicyExists(
                         promptInfo.isDisallowBiometricsIfPolicyExists())
-                .setReceiveSystemEvents(true);
+                .setReceiveSystemEvents(true)
+                .build();
+    }
 
-        mBiometricPrompt = builder.build();
+    @Override
-        mCancellationSignal = new CancellationSignal();
+    public void onResume() {
+        super.onResume();
 
-        mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor,
+        if (mCancellationSignal == null) {
-                mAuthenticationCallback, mUserId);
+            mCancellationSignal = new CancellationSignal();
+            mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor,
+                    mAuthenticationCallback, mUserId);
+        }
     }
 
     @Override
@@ -154,4 +159,3 @@ public class BiometricFragment extends InstrumentedFragment {
         return SettingsEnums.BIOMETRIC_FRAGMENT;
     }
 }
-

src/com/android/settings/password/ConfirmDeviceCredentialActivity.java

@@ -150,17 +150,6 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
         }
     };
 
-    private String getStringForError(int errorCode) {
-        switch (errorCode) {
-            case BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED:
-                return getString(com.android.internal.R.string.biometric_error_user_canceled);
-            case BiometricConstants.BIOMETRIC_ERROR_CANCELED:
-                return getString(com.android.internal.R.string.biometric_error_canceled);
-            default:
-                return null;
-        }
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);