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

Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338

Change-Id: I82b44ce36153a64d37629f40dc8c7805c17847a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oli Thompson
2023-06-09 17:02:43 +00:00
committed by Automerger Merge Worker
parent dff1bd58de e86146d685
commit f35b1be8ac
3 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/confirm_lock_pattern_base.xml
View File

@@ -29,8 +29,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="24dp">
android:orientation="vertical">
<Button
android:id="@+id/cancelButton"
@@ -87,6 +86,7 @@
android:paddingStart="?attr/sudMarginStart"
android:paddingEnd="?attr/sudMarginEnd"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:gravity="center_vertical"/>
<Button
@@ -96,8 +96,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginTop="60dp"
android:layout_marginBottom="14dp"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:text="@string/work_challenge_emergency_button_text"/>

1
res/layout/confirm_lock_pattern_normal_base.xml
View File

@@ -61,6 +61,7 @@
android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:gravity="center_vertical"/>
<CheckBox