Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d1bac25518
@@ -24,23 +24,17 @@
|
||||
android:layout_height="match_parent"
|
||||
app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
|
||||
|
||||
<FrameLayout
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:clipToPadding="false"
|
||||
android:clipChildren="false">
|
||||
|
||||
<include
|
||||
layout="@layout/fingerprint_enroll_find_sensor_graphic"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_horizontal|bottom"/>
|
||||
|
||||
<LinearLayout
|
||||
style="@style/SuwContentFrame"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:clipToPadding="false"
|
||||
android:clipChildren="false">
|
||||
@@ -51,21 +45,18 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/suw_description_glif_margin_top"
|
||||
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<Button
|
||||
style="@style/SuwGlifButton.Secondary"
|
||||
android:id="@+id/next_button"
|
||||
android:layout_width="wrap_content"
|
||||
<include
|
||||
layout="@layout/fingerprint_enroll_find_sensor_graphic"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:layout_gravity="end"
|
||||
android:text="@string/fingerprint_enroll_button_next" />
|
||||
android:layout_gravity="center_horizontal"/>
|
||||
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</com.android.setupwizardlib.GlifLayout>
|
||||
|
Reference in New Issue
Block a user