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

Merge "Update button styles for fingerprint" into nyc-mr1-dev

Browse Source
This commit is contained in:
Maurice Lam
2016-07-12 01:51:11 +00:00
committed by Android (Google) Code Review
parent 709aa539c8 584a11ec4a
commit 68d65abaaa
4 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
res/layout/fingerprint_enroll_introduction.xml
View File

@@ -15,10 +15,51 @@
limitations under the License
-->
<com.android.setupwizardlib.GlifRecyclerLayout
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="?attr/fingerprint_layout_theme"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:entries="@xml/fingerprint_enroll_introduction_items" />
android:layout_height="match_parent">
<LinearLayout
style="@style/SuwContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.android.setupwizardlib.view.RichTextView
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_introduction_message" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/fingerprint_cancel_button"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_introduction_cancel" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<Button
android:id="@+id/fingerprint_next_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/suw_next_button_label" />
</LinearLayout>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>