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

Browse Source 
am: eafcc98ab8

Change-Id: I3da818a64d47a397c2380cbd0ae36a714612d8f0
This commit is contained in:
Adrian Roos
2017-09-25 11:17:22 +00:00
committed by android-build-merger
parent 7c94fcc9bc eafcc98ab8
commit fce69dbb56
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"/> android:visibility="gone"/>
<Button <Button
style="@style/SetupWizardButton.Negative"
android:id="@+id/cancelButton" android:id="@+id/cancelButton"
style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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" /> android:text="@string/cancel" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

19
res/layout/confirm_lock_pattern_internal_base.xml
View File

@@ -100,16 +100,17 @@
android:contentDescription="@string/confirm_fingerprint_icon_content_description" android:contentDescription="@string/confirm_fingerprint_icon_content_description"
android:visibility="gone"/> android:visibility="gone"/>
</LinearLayout> <Button
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:text="@string/cancel" />
<Button </LinearLayout>
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:text="@string/cancel" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>