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

Fix overlapped text in lockscreen pattern setup

Browse Source 
1. Remove unused button to resolve overlap
2. Enlarge the scrollview area

Bug: 62101742
Test: Manual
Change-Id: I15df29be01741df1fb508f89019c905ac3e24ca2
This commit is contained in:
pastychang
2019-05-29 17:57:47 +08:00
parent a96699ddbd
commit c80453777c
1 changed files with 19 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
res/layout-land/choose_lock_pattern.xml
View File

@@ -43,27 +43,27 @@
android:clipToPadding="false"
android:orientation="vertical">
<ImageView
android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="?attr/sudGlifHeaderGravity"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:src="@drawable/ic_lock"/>
<ScrollView
android:id="@+id/scroll_layout_title_header"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3.0">
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/sud_layout_icon"
style="@style/SudGlifIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="?attr/sudGlifHeaderGravity"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:src="@drawable/ic_lock"/>
<TextView
android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle"
@@ -88,6 +88,14 @@
android:gravity="?attr/sudGlifHeaderGravity"
android:textSize="18sp"/>
<TextView android:id="@+id/footerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:textSize="14sp"
android:visibility="gone" />
<Button
android:id="@+id/screen_lock_options"
style="@style/SudGlifButton.Tertiary"
@@ -102,65 +110,6 @@
</ScrollView>
<!-- footer can show a message, or confirm / restart buttons -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0"
android:clipChildren="false"
android:clipToPadding="false">
<!-- confirm / restart buttons -->
<LinearLayout android:id="@+id/buttonContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal">
<!-- left : skip -->
<Button android:id="@+id/skip_button"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/skip_label"
android:visibility="gone" />
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_restart_button_text" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerRightButton"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_confirm_button_text" />
</LinearLayout>
<!-- message above buttons -->
<TextView android:id="@+id/footerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/buttonContainer"
android:layout_centerHorizontal="true"
android:layout_marginBottom="4dip"
android:textSize="14sp"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
<!-- right side: lock pattern -->