Merge "Added intro lottie for foldable."
diff --git a/res/layout/sfps_enroll_finish_base.xml b/res/layout/sfps_enroll_finish_base.xml
index 8d062d9..1773337 100644
--- a/res/layout/sfps_enroll_finish_base.xml
+++ b/res/layout/sfps_enroll_finish_base.xml
@@ -30,12 +30,14 @@
android:clipToPadding="false"
android:clipChildren="false">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:gravity="center"
- android:orientation="vertical">
+ <com.android.settings.biometrics.fingerprint.FingerprintRequireScreenOnToAuthToggle
+ style="@style/SudSwitchStyle"
+ android:id="@+id/require_screen_on_to_auth_toggle"
+ android:layout_gravity="start"
+ android:paddingLeft="0dp"
+ android:paddingStart="0dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
<com.google.android.setupdesign.view.FillContentLayout
android:layout_width="@dimen/sfps_enrollment_finished_icon_max_size"
@@ -54,21 +56,6 @@
android:importantForAccessibility="no"
android:src="@drawable/sfps_enroll_finish" />
</com.google.android.setupdesign.view.FillContentLayout>
-
- <Space
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- <com.android.settings.biometrics.fingerprint.FingerprintRequireScreenOnToAuthToggle
- style="@style/SudSwitchStyle"
- android:id="@+id/require_screen_on_to_auth_toggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|bottom" />
-
- </LinearLayout>
-
</LinearLayout>
-</com.google.android.setupdesign.GlifLayout>
\ No newline at end of file
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/sfps_require_screen_on_to_auth_toggle.xml b/res/layout/sfps_require_screen_on_to_auth_toggle.xml
index 929b64b..02bb979 100644
--- a/res/layout/sfps_require_screen_on_to_auth_toggle.xml
+++ b/res/layout/sfps_require_screen_on_to_auth_toggle.xml
@@ -19,24 +19,16 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
style="?attr/fingerprint_layout_theme">
- <!-- Top divider -->
- <View
- android:layout_alignParentTop="true"
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="?android:attr/listDivider" />
-
<!-- Title -->
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/title"
- android:paddingHorizontal="8dp"
android:paddingTop="8dp"
android:paddingBottom="4dp"
- android:gravity="start"
android:layout_alignParentStart="true"
- android:layout_toStartOf="@+id/toggle"
+ android:textAlignment="viewStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/security_settings_require_screen_on_to_auth_title"
@@ -47,9 +39,9 @@
<!-- Subtitle -->
<TextView
android:id="@+id/subtitle"
- android:paddingHorizontal="8dp"
android:paddingBottom="8dp"
android:layout_alignParentStart="true"
+ android:textAlignment="viewStart"
android:layout_toStartOf="@+id/toggle"
android:layout_below="@+id/title"
android:layout_width="wrap_content"
@@ -57,16 +49,6 @@
android:text="@string/security_settings_require_screen_on_to_auth_description"
android:textColor="?android:attr/textColorSecondary"/>
- <!-- Vertical divider -->
- <View
- android:layout_centerVertical="true"
- android:layout_alignTop="@+id/toggle"
- android:layout_alignBottom="@+id/toggle"
- android:layout_toStartOf="@+id/toggle"
- android:layout_width="1dp"
- android:layout_height="wrap_content"
- android:background="?android:attr/listDivider" />
-
<!-- Toggle -->
<Switch
android:layout_alignParentEnd="true"
@@ -74,6 +56,7 @@
android:layout_height="wrap_content"
android:id="@+id/toggle"
android:layout_centerVertical="true"
- android:checked="false"/>
+ android:checked="false"
+ style="@style/SudSwitchStyle"/>
</RelativeLayout>
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 1c7c891..2cbef99 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -243,7 +243,9 @@
}
private void updateDialog() {
- setRequireScreenOnToAuthVisibility();
+ if (isSfps()) {
+ setRequireScreenOnToAuthVisibility();
+ }
RenameDialog renameDialog = (RenameDialog) getFragmentManager().
findFragmentByTag(RenameDialog.class.getName());
if (renameDialog != null) {
@@ -455,6 +457,15 @@
return false;
}
+ private boolean isSfps() {
+ for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
+ if (prop.isAnySidefpsType()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
protected void removeFingerprintPreference(int fingerprintId) {
String name = genKey(fingerprintId);
Preference prefToRemove = findPreference(name);
@@ -493,6 +504,10 @@
mRequireScreenOnToAuthPreferenceController.setChecked(!isChecked);
return true;
});
+ mRequireScreenOnToAuthPreference.setVisible(false);
+ if (isSfps()) {
+ setRequireScreenOnToAuthVisibility();
+ }
setPreferenceScreen(root);
return root;
}