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

am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev

Browse Source 
* commit '51eec32afa0d4599b437b1823a2b42d44d9bf001':
  [LockScreenSetup] Move retry button to top
This commit is contained in:
Maurice Lam
2015-05-21 22:06:29 +00:00
committed by Android Git Automerger
parent c8f78ec956 51eec32afa
commit 03d1299646
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/layout/setup_choose_lock_pattern.xml
View File

@@ -48,6 +48,13 @@
android:minHeight="50dip"
android:textSize="18sp"/>
<Button android:id="@+id/retryButton"
style="@android:style/Widget.Material.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/lockpattern_retry_button_text"/>
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="0dip"
@@ -56,24 +63,13 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
<TextView android:id="@+id/footerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<Button android:id="@+id/retryButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_retry_button_text"/>
<TextView android:id="@+id/footerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="50dip"
android:textSize="14sp"/>
</LinearLayout>
android:layout_gravity="center_horizontal"
android:minHeight="50dip"
android:textSize="14sp"
android:visibility="gone"/>
<!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
<LinearLayout

2
res/values/strings.xml
View File

@@ -2926,7 +2926,7 @@
<!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. After they draw a pattern and release their finger, we display the pattern so they remember. If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
<string name="lockpattern_restart_button_text">Redraw</string>
<!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
<string name="lockpattern_retry_button_text">Retry</string>
<string name="lockpattern_retry_button_text">Clear</string>
<!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
<string name="lockpattern_continue_button_text">Continue</string>
<!-- Security & location settings screen, unlock screen activity title -->