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

resolve merge conflicts of f36b25c2df to stage-aosp-master

Browse Source 
am: d4621f6302

Change-Id: I7f2e89579a99523808138eaabffa917b1e02e3b0
This commit is contained in:
Maurice Lam
2017-10-16 19:22:12 +00:00
committed by android-build-merger
parent f1dc9e65f1 d4621f6302
commit 0e1c486e74
1 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
res/layout-land/fingerprint_enroll_find_sensor.xml
View File

@@ -40,51 +40,60 @@
android:clipToPadding="false" android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false"
android:fillViewport="true">
<ImageView <LinearLayout
android:id="@+id/suw_layout_icon"
style="@style/SuwGlifIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="?attr/suwGlifHeaderGravity"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:src="@drawable/ic_fingerprint_header" />
<TextView
android:id="@+id/suw_layout_title"
style="@style/SuwGlifHeaderTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="0dp" android:orientation="vertical"
android:layout_marginEnd="0dp" /> android:clipChildren="false"
android:clipToPadding="false">
<TextView <ImageView
style="@style/SuwDescription.Glif" android:id="@+id/suw_layout_icon"
android:layout_width="match_parent" style="@style/SuwGlifIcon"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/> android:layout_height="wrap_content"
android:layout_gravity="?attr/suwGlifHeaderGravity"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:src="@drawable/ic_fingerprint_header" />
<Space <TextView
android:layout_width="0dp" android:id="@+id/suw_layout_title"
android:layout_height="0dp" style="@style/SuwGlifHeaderTitle"
android:layout_weight="1" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp" />
<Button <TextView
style="@style/SetupWizardButton.Negative" style="@style/SuwDescription.Glif"
android:id="@+id/skip_button" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
android:layout_marginTop="8dp"
android:text="@string/skip_label" />
</LinearLayout> <Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<Button
style="@style/SetupWizardButton.Negative"
android:id="@+id/skip_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/skip_label" />
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>