bdfc27f9ac
- The negative/secondary button styles now have the correct alpha for the touch highlight. (24%) - The negative/secondary buttons now align correctly based on their labels text, instead of based on the bounds of the touch highlight. - Fixed issues with button shadows being cropped. Test: Manual inspection. Existing tests pass. Change-Id: I261e504d661d7a53eda3561a26942ea11ba0d429
77 lines
2.9 KiB
XML
77 lines
2.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2015 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License
|
|
-->
|
|
|
|
<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">
|
|
|
|
<LinearLayout
|
|
style="@style/SuwContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="vertical">
|
|
|
|
<com.android.setupwizardlib.view.RichTextView
|
|
android:id="@+id/description_text"
|
|
style="@style/SuwDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_enroll_introduction_message" />
|
|
|
|
<com.android.setupwizardlib.view.RichTextView
|
|
android:id="@+id/error_text"
|
|
style="@style/SuwDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" />
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
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>
|