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

Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d am: 7bc93a4d5c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824

Change-Id: I21924526a85c7d9dae60f5267d1bfd0affd9cac1
This commit is contained in:
TreeHugger Robot
2021-07-01 19:46:58 +00:00
committed by Automerger Merge Worker
parent a596cdccb6 7bc93a4d5c
commit 74b25978ac
3 changed files with 45 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
res/layout/face_enroll_introduction.xml
View File

@@ -43,9 +43,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="-24dp"
android:layout_marginBottom="4dp">
<ImageView <ImageView
style="@style/SudContentIllustration" style="@style/SudContentIllustration"
@@ -66,15 +64,13 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_face_enroll_introduction_info_title" style="@style/BiometricEnrollIntroTitle"
android:textColor="?android:attr/textColorPrimary" android:text="@string/security_settings_face_enroll_introduction_info_title" />
android:textSize="20sp"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingTop="24dp">
<ImageView <ImageView
android:id="@+id/icon_glasses" android:id="@+id/icon_glasses"
@@ -88,15 +84,13 @@
android:id="@+id/info_message_glasses" android:id="@+id/info_message_glasses"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroMessage" />
android:textSize="16sp"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingTop="24dp">
<ImageView <ImageView
android:id="@+id/icon_looking" android:id="@+id/icon_looking"
@@ -110,56 +104,35 @@
android:id="@+id/info_message_looking" android:id="@+id/info_message_looking"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroMessage" />
android:textSize="16sp"/>
</LinearLayout> </LinearLayout>
<Space
android:layout_width="match_parent"
android:layout_height="40dp"/>
<!-- How it works --> <!-- How it works -->
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_face_enroll_introduction_how_title" style="@style/BiometricEnrollIntroTitle"
android:textColor="?android:attr/textColorPrimary" android:text="@string/security_settings_face_enroll_introduction_how_title" />
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"/>
<Space
android:layout_width="match_parent"
android:layout_height="24dp"/>
<TextView <TextView
android:id="@+id/how_message" android:id="@+id/how_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroMessage" />
android:textSize="16sp"/>
<Space
android:layout_width="match_parent"
android:layout_height="24dp"/>
<!-- You're in control --> <!-- You're in control -->
<TextView <TextView
android:id="@+id/title_in_control" android:id="@+id/title_in_control"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroTitle" />
android:textSize="20sp"/>
<Space
android:layout_width="match_parent"
android:layout_height="24dp"/>
<TextView <TextView
android:id="@+id/message_in_control" android:id="@+id/message_in_control"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroMessage"
android:textSize="16sp"/> android:paddingBottom="0dp" />
</LinearLayout> </LinearLayout>

57
res/layout/fingerprint_enroll_introduction.xml
View File

@@ -42,8 +42,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginVertical="12dp">
<ImageView <ImageView
style="@style/SudContentIllustration" style="@style/SudContentIllustration"
@@ -64,15 +63,13 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2" style="@style/BiometricEnrollIntroTitle"
android:textColor="?android:attr/textColorPrimary" android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2" />
android:textSize="20sp"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingTop="24dp">
<ImageView <ImageView
android:id="@+id/icon_fingerprint" android:id="@+id/icon_fingerprint"
@@ -87,15 +84,13 @@
android:id="@+id/footer_message_2" android:id="@+id/footer_message_2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroMessage" />
android:textSize="16sp"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingTop="24dp">
<ImageView <ImageView
android:id="@+id/icon_device_locked" android:id="@+id/icon_device_locked"
@@ -110,27 +105,20 @@
android:id="@+id/footer_message_3" android:id="@+id/footer_message_3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroMessage" />
android:textSize="16sp"/>
</LinearLayout> </LinearLayout>
<Space
android:layout_width="match_parent"
android:layout_height="24dp"/>
<!-- You're in control --> <!-- You're in control -->
<TextView <TextView
android:id="@+id/footer_title_1" android:id="@+id/footer_title_1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroTitle" />
android:textSize="20sp"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingTop="24dp">
<ImageView <ImageView
android:id="@+id/icon_trash_can" android:id="@+id/icon_trash_can"
@@ -145,28 +133,21 @@
android:id="@+id/footer_message_4" android:id="@+id/footer_message_4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroMessage" />
android:textSize="16sp"/>
</LinearLayout> </LinearLayout>
<Space
android:layout_width="match_parent"
android:layout_height="24dp"/>
<!-- Keep in mind --> <!-- Keep in mind -->
<TextView <TextView
android:id="@+id/footer_title_2" android:id="@+id/footer_title_2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_face_enroll_introduction_info_title" style="@style/BiometricEnrollIntroTitle"
android:textColor="?android:attr/textColorPrimary" android:text="@string/security_settings_face_enroll_introduction_info_title"/>
android:textSize="20sp"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingTop="24dp">
<ImageView <ImageView
android:id="@+id/icon_info" android:id="@+id/icon_info"
@@ -181,15 +162,13 @@
android:id="@+id/footer_message_5" android:id="@+id/footer_message_5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" style="@style/BiometricEnrollIntroMessage" />
android:textSize="16sp"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingTop="24dp">
<ImageView <ImageView
android:id="@+id/icon_link" android:id="@+id/icon_link"
@@ -203,9 +182,9 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_message_learn_more" style="@style/BiometricEnrollIntroMessage"
android:textColor="?android:attr/textColorPrimary" android:paddingBottom="0dp"
android:textSize="16sp"/> android:text="@string/security_settings_fingerprint_v2_enroll_introduction_message_learn_more" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

14
res/values/styles.xml
View File

@@ -398,6 +398,20 @@
<item name="android:lineSpacingMultiplier">1.2</item> <item name="android:lineSpacingMultiplier">1.2</item>
</style> </style>
<style name="BiometricEnrollIntroTitle">
<item name="android:paddingVertical">24dp</item>
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">20sp</item>
</style>
<style name="BiometricEnrollIntroMessage">
<item name="android:lineSpacingMultiplier">1.2</item>
<item name="android:paddingBottom">16dp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">16sp</item>
</style>
<style name="RingProgressBarStyle" <style name="RingProgressBarStyle"
parent="android:style/Widget.Material.ProgressBar.Horizontal"> parent="android:style/Widget.Material.ProgressBar.Horizontal">
<item name="android:indeterminate">false</item> <item name="android:indeterminate">false</item>