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

Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev

Browse Source 
am: d1bac25518

Change-Id: Ib5269308dfd159b0bf535421ae9bc65628aee3e6
This commit is contained in:
Ajay Nadathur
2017-07-12 20:07:19 +00:00
committed by android-build-merger
parent 3d627974d6 d1bac25518
commit 4aaa52d1d6
1 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/layout/fingerprint_enroll_find_sensor_base.xml
View File

@@ -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
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_weight="1"/>
<Button
style="@style/SuwGlifButton.Secondary"
android:id="@+id/next_button"
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
<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>