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

Merge "Add skip button to fingerprint settings" into nyc-mr1-dev

Browse Source 
am: c2a929f06a

* commit 'c2a929f06ae98346fa1133c50e90888d496bc076':
  Add skip button to fingerprint settings

Change-Id: I0f7e22626ec6652bda5d663943cbf2b5875415a3
This commit is contained in:
Maurice Lam
2016-05-23 18:11:52 +00:00
committed by android-build-merger
parent a3aa83da32 c2a929f06a
commit d39ac69ef1
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,17 +33,17 @@
<!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
See layouts/fingerprint_enroll_enrolling_base.xml. -->
<FrameLayout
<RelativeLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
android:layout_height="wrap_content">
<TextView
style="@style/TextAppearance.FingerprintMessage"
android:id="@+id/start_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="@string/security_settings_fingerprint_enroll_start_message"/>
<TextView
@@ -51,10 +51,21 @@
android:id="@+id/repeat_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="@string/security_settings_fingerprint_enroll_repeat_message"
android:visibility="invisible"/>
</FrameLayout>
<Button
android:id="@+id/skip_button"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="8dp"
android:text="@string/skip_label"
android:visibility="gone" />
</RelativeLayout>
<FrameLayout
android:layout_width="0dp"