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
This commit is contained in:
TreeHugger Robot
2017-07-12 20:03:14 +00:00
committed by Android (Google) Code Review
parent 0bde6dcb18 ba313c0347
commit d1bac25518
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" android:layout_height="match_parent"
app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer"> app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
<FrameLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:clipToPadding="false" android:clipToPadding="false"
android:clipChildren="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 <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:clipToPadding="false" android:clipToPadding="false"
android:clipChildren="false"> android:clipChildren="false">
@@ -51,21 +45,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top" android:layout_marginTop="@dimen/suw_description_glif_margin_top"
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/> android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
</LinearLayout>
<View <Space
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" 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_height="wrap_content"
android:layout_marginBottom="4dp" android:layout_gravity="center_horizontal"/>
android:layout_gravity="end"
android:text="@string/fingerprint_enroll_button_next" />
</LinearLayout> </LinearLayout>
</FrameLayout>
</com.android.setupwizardlib.GlifLayout> </com.android.setupwizardlib.GlifLayout>