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

16
res/layout/choose_lock_pattern_tutorial.xml
View File

@@ -33,6 +33,7 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="5dip"> android:padding="5dip">
<!-- Top: instructions -->
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -40,26 +41,27 @@
android:text="@string/lock_title" android:text="@string/lock_title"
android:paddingBottom="10dip" android:paddingBottom="10dip"
style="?android:attr/textAppearanceLarge" style="?android:attr/textAppearanceLarge"
android:visibility="visible"
/> />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="18sp"
android:text="@string/lock_intro_message" android:text="@string/lock_intro_message"
/> />
<!-- bottom: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="200dip"
android:layout_height="200dip"
android:layout_marginTop="10dip"
android:layout_gravity="left"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
<!-- bottom: lock pattern. Note the size is match_parent in both axis since requested aspect
is square and the pattern view will choose the smaller of the two. -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<LinearLayout <LinearLayout
style="@style/SecurityPreferenceButtonContainer" style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal"> android:orientation="horizontal">

8
res/values/strings.xml
View File

@@ -2132,12 +2132,8 @@
\n\nReady to start? Touch \u201CNext\u201D. \n\nReady to start? Touch \u201CNext\u201D.
</string> </string>
<!-- ChooseLockPatternTutorial, tutorial screen text --> <!-- ChooseLockPatternTutorial, tutorial screen text -->
<string name="lock_intro_message" product="default"><font size="17">Protect your phone from unauthorized use by creating a personal screen unlock pattern. <string name="lock_intro_message" product="default">Protect your phone from unauthorized use by creating a personal screen unlock pattern. Use your finger to connect at least four dots in any order on the next screen.
\n<font height="17">\n</font><b>1</b>\u00A0 On the next screen, watch while an example pattern is drawn. \n\nReady to start? Touch \u201CNext\u201D.
\n<font height="17">\n</font><b>2</b>\u00A0 When ready, draw your own personal unlock pattern. Experiment with different patterns but connect at least four dots.
\n<font height="17">\n</font><b>3</b>\u00A0 Redraw your pattern to confirm.
\n<font height="17">\n</font><b>Ready to start? Touch \u201CNext\u201D</b>.
\n<font height="3">\n</font>To leave your phone unprotected, touch \u201CCancel\u201D.</font>
</string> </string>
<!-- Applications Settings --> <skip /> <!-- Applications Settings --> <skip />