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

FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme

Browse Source 
Change-Id: I152a777b60ac6bfb4c8e1399e31cc0d4b2ab9758
Fixes: 65408626
Test: manual
This commit is contained in:
Adrian Roos
2017-09-22 13:28:54 +02:00
parent ac040e3b1f
commit d5e3c38bbe
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>

5
res/layout/confirm_lock_pattern_internal_base.xml
View File

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