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

Merge "Update button styles in fingerprint setup" into nyc-mr1-dev

Browse Source 
am: 92d90a9df0

* commit '92d90a9df0c1c19a6682f105c3f48c4d0f8ac130':
  Update button styles in fingerprint setup

Change-Id: I4f825bf184213205d0a54fa9fe26274be1a31ede
This commit is contained in:
Maurice Lam
2016-05-26 00:09:05 +00:00
committed by android-build-merger
parent 2a94bc34df 92d90a9df0
commit 433671278f
6 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,13 +45,11 @@
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
<Button
style="@style/Button.FingerprintButton"
style="@style/SetupWizardButton.Positive"
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginStart="-12dp"
android:gravity="start|center_vertical"
android:text="@string/fingerprint_enroll_button_next" />
</LinearLayout>

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

@@ -63,7 +63,7 @@
android:orientation="horizontal">
<Button
style="@style/Button.FingerprintButton"
style="@style/SetupWizardButton.Negative"
android:id="@+id/add_another_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
android:text="@string/fingerprint_enroll_button_add" />
<Button
style="@style/Button.FingerprintButton"
style="@style/SetupWizardButton.Positive"
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -45,13 +45,11 @@
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
<Button
style="@style/Button.FingerprintButton"
style="@style/SetupWizardButton.Positive"
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginStart="-12dp"
android:gravity="start|center_vertical"
android:text="@string/fingerprint_enroll_button_next" />
</LinearLayout>

3
res/layout/fingerprint_enroll_find_sensor_base.xml
View File

@@ -56,12 +56,11 @@
android:layout_weight="1"/>
<Button
style="@style/Button.FingerprintButton"
style="@style/SetupWizardButton.Positive"
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginEnd="-12dp"
android:layout_gravity="end"
android:text="@string/fingerprint_enroll_button_next" />

4
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -80,14 +80,14 @@
android:orientation="horizontal">
<Button
style="@style/Button.FingerprintButton"
style="@style/SetupWizardButton.Negative"
android:id="@+id/add_another_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fingerprint_enroll_button_add" />
<Button
style="@style/Button.FingerprintButton"
style="@style/SetupWizardButton.Positive"
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
res/layout/setup_fingerprint_enroll_find_sensor_base.xml
View File

@@ -56,14 +56,12 @@
android:layout_weight="1"/>
<Button
style="@style/Button.FingerprintButton"
style="@style/SetupWizardButton.Positive"
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginEnd="-12dp"
android:layout_gravity="end"
android:gravity="end|center_vertical"
android:text="@string/fingerprint_enroll_button_next" />
</LinearLayout>