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

Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev am: eafcc98ab8

Browse Source 
am: fce69dbb56

Change-Id: I43cef01451f2dead8a2a0a6abf745daa2f2090bb
This commit is contained in:
Adrian Roos
2017-09-25 11:19:04 +00:00
committed by android-build-merger
parent 15b71d0305 fce69dbb56
commit c1b9a8e538
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/confirm_lock_password_internal.xml
View File

@@ -81,10 +81,14 @@
android:visibility="gone"/>
<Button
style="@style/SetupWizardButton.Negative"
android:id="@+id/cancelButton"
style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides"
android:layout_marginBottom="80dp"
android:layout_gravity="center_horizontal"
android:text="@string/cancel" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

5
res/layout/confirm_lock_pattern_internal_base.xml
View File

@@ -100,8 +100,6 @@
android:contentDescription="@string/confirm_fingerprint_icon_content_description"
android:visibility="gone"/>
</LinearLayout>
<Button
android:id="@+id/cancelButton"
style="@style/SuwGlifButton.Secondary"
@@ -109,8 +107,11 @@
android:layout_height="wrap_content"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides"
android:layout_marginBottom="80dp"
android:text="@string/cancel" />
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout>