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

Fix 4686480: Update ChooseLockPatternTutorial

Browse Source 
- Shorten description string to fit on one page
- Use new scalable LockPatternView to show example pattern.

Change-Id: I1204b6de9da05d9d3f4e503bec2fc4fb3034a4b3
This commit is contained in:
Jim Miller
2011-06-30 18:09:06 -07:00
parent f5f40108ad
commit c56293dae1
3 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
res/layout-land/choose_lock_pattern_tutorial.xml
View File

@@ -17,29 +17,29 @@
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:orientation="horizontal"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
<!-- Top: pattern and information -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="horizontal">
<!-- left side: lock pattern -->
<!-- left side: lock pattern. Given the square aspect, this will be the smaller of the
two dimensions (height) -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="300dip"
android:layout_height="300dip"
android:layout_gravity="center_horizontal"
aspect="square"/>
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<!-- right side: instructions and buttons -->
<!-- header message -->
<ScrollView
android:layout_width="300dip"
android:layout_height="180dip"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/lockPattern"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="25dip">
<LinearLayout
@@ -69,25 +69,24 @@
</ScrollView>
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
</LinearLayout>
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/skip_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_tutorial_cancel_label"/>
<!-- Bottom: cancel/next buttons -->
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal">
<!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_tutorial_continue_label"/>
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/skip_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_tutorial_cancel_label"/>
</LinearLayout>
<!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_tutorial_continue_label"/>
</RelativeLayout>
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>