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

Support center alignment

Browse Source 
Update styles to reference the theme attribute suwGlifHeaderGravity
to, directly or indirectly via SuwDescription.Glif.

Test: Existing tests pass
Bug: 36368632
Change-Id: I6c7c234c32fdd614d4a9cdfabbef05626dad0a93
This commit is contained in:
Maurice Lam
2017-03-16 17:21:05 -07:00
parent 304d7f4455
commit 8d5a4f1689
10 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -66,14 +66,14 @@
android:layout_height="wrap_content">
<TextView
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:id="@+id/start_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_start_message"/>
<TextView
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:id="@+id/repeat_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout-land/fingerprint_enroll_find_sensor.xml
View File

@@ -65,7 +65,7 @@
android:layout_marginEnd="0dp" />
<TextView
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>

4
res/layout-land/fingerprint_enroll_finish.xml
View File

@@ -42,14 +42,14 @@
<TextView
android:id="@+id/message"
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
<TextView
android:id="@+id/message_secondary"
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top"

6
res/layout/choose_lock_generic_fingerprint_header.xml
View File

@@ -18,9 +18,9 @@
android:id="@+id/fingerprint_header_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_glif_margin_top"
android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:text="@string/lock_settings_picker_fingerprint_message"
style="@style/FingerprintHeaderStyle" />
style="@style/SuwDescription.Glif" />

4
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -38,14 +38,14 @@
android:layout_marginTop="@dimen/suw_description_glif_margin_top">
<TextView
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:id="@+id/start_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_start_message"/>
<TextView
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:id="@+id/repeat_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/fingerprint_enroll_find_sensor_base.xml
View File

@@ -44,7 +44,7 @@
android:clipChildren="false">
<TextView
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top"

4
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -32,7 +32,7 @@
<TextView
android:id="@+id/message"
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top"
@@ -40,7 +40,7 @@
<TextView
android:id="@+id/message_secondary"
style="@style/TextAppearance.FingerprintMessage"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top"

19
res/layout/setup_choose_lock_generic_fingerprint_header.xml
View File

@@ -16,14 +16,11 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_glif_margin_top"
android:text="@string/setup_lock_settings_picker_fingerprint_message"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:textAppearance="?android:attr/textAppearanceListItem" />
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_glif_margin_top"
android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:text="@string/setup_lock_settings_picker_fingerprint_message" />

19
res/layout/setup_choose_lock_generic_header.xml
View File

@@ -16,14 +16,11 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_glif_margin_top"
android:text="@string/setup_lock_settings_picker_message"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:textAppearance="?android:attr/textAppearanceListItem" />
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_glif_margin_top"
android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:text="@string/setup_lock_settings_picker_message" />

16
res/values/styles.xml
View File

@@ -312,22 +312,6 @@
<item name="android:textSize">14sp</item>
</style>
<style name="TextAppearance.FingerprintMessage"
parent="android:TextAppearance.Material.Subhead">
<item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
</style>
<style name="Button.FingerprintButton"
parent="android:Widget.Material.Button.Borderless">
<item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
<style name="TextAppearance.FingerprintLink"
parent="TextAppearance.FingerprintMessage">
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
<style name="TextAppearance.FingerprintErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">?android:attr/colorError</item>