style="@style/SecurityPreferenceButtonContainer"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
- android:orientation="vertical">
+ android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton"
android:id="@+id/topLayout"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/black">
+ android:layout_height="match_parent">
<!-- left side: instructions and messages -->
<LinearLayout
<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">
-
- <!-- left side: lock pattern widget -->
- <RelativeLayout
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center_horizontal|center_vertical"
- android:orientation="horizontal">
-
- <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="354dip"
- android:layout_height="354dip"
- aspect="square"/>
-
- </RelativeLayout>
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal">
- <!-- right side: instructions and buttons -->
- <RelativeLayout
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center_horizontal">
+ <!-- header message -->
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:layout_marginTop="14dip">
- <!-- footer message -->
- <TextView android:id="@+id/footerText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/headerText"
- android:layout_marginTop="16dip"
- android:layout_toEndOf="@id/lockPattern"
- android:layout_marginStart="100dip"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:visibility="gone"/>
-
- <!-- confirm / restart buttons -->
- <LinearLayout android:id="@+id/buttonContainer"
- style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
- android:orientation="horizontal">
-
- <!-- left / top button: skip, or re-try -->
- <Button android:id="@+id/footerLeftButton"
- style="@style/SecurityPreferenceButton"
- android:text="@string/lockpattern_restart_button_text"/>
-
- <!-- right / bottom button: confirm or ok -->
- <Button android:id="@+id/footerRightButton"
- style="@style/SecurityPreferenceButton"
- android:text="@string/lockpattern_confirm_button_text"/>
-
- </LinearLayout>
-
- <!-- header message -->
- <ScrollView
+ <TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_marginTop="20dip"
- android:layout_marginStart="20dip"
- android:layout_above="@id/buttonContainer"
- android:gravity="center_vertical|center_horizontal">
-
- <TextView android:id="@+id/headerText"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+ </ScrollView>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="0.6"/>
+
+ <!-- lock pattern widget -->
+ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+ android:layout_width="354dip"
+ android:layout_height="354dip"
+ aspect="square"/>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
+
+ <!-- footer message -->
+ <TextView android:id="@+id/footerText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/headerText"
+ android:layout_marginTop="16dip"
+ android:layout_toEndOf="@id/lockPattern"
+ android:layout_marginStart="100dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:visibility="gone"/>
+
+ <!-- confirm / restart buttons -->
+ <LinearLayout android:id="@+id/buttonContainer"
+ style="@style/SecurityPreferenceButtonContainer"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentBottom="true"
+ android:orientation="horizontal">
- </ScrollView>
+ <!-- left / top button: skip, or re-try -->
+ <Button android:id="@+id/footerLeftButton"
+ style="@style/SecurityPreferenceButton"
+ android:text="@string/lockpattern_restart_button_text"/>
+ <!-- right / bottom button: confirm or ok -->
+ <Button android:id="@+id/footerRightButton"
+ style="@style/SecurityPreferenceButton"
+ android:text="@string/lockpattern_confirm_button_text"/>
- </RelativeLayout>
+ </LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
<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">
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal">
- <!-- left side: lock pattern widget -->
- <RelativeLayout
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center_horizontal|center_vertical"
- android:orientation="horizontal">
+ <!-- header message -->
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:layout_marginTop="40dip">
- <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="354dip"
- android:layout_height="354dip"
- aspect="square"/>
-
- </RelativeLayout>
-
- <!-- right side: instructions and buttons -->
- <RelativeLayout
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center_horizontal">
-
- <!-- confirm / restart buttons -->
- <LinearLayout android:id="@+id/buttonContainer"
- style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
- android:orientation="horizontal"
- android:visibility="invisible">
-
- <!-- left / top button: skip, or re-try -->
- <Button android:id="@+id/footerLeftButton"
- style="@style/SecurityPreferenceButton"
- android:text="@string/lockpattern_restart_button_text"/>
-
- <!-- right / bottom button: confirm or ok -->
- <Button android:id="@+id/footerRightButton"
- style="@style/SecurityPreferenceButton"
- android:text="@string/lockpattern_confirm_button_text"/>
-
- </LinearLayout>
-
- <!-- footer message -->
- <TextView android:id="@+id/footerText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_above="@id/buttonContainer"
- android:layout_marginTop="16dip"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
-
- <!-- header message -->
- <ScrollView
+ <TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_marginTop="20dip"
- android:layout_marginStart="20dip"
- android:layout_above="@id/footerText"
- android:gravity="center_vertical|center_horizontal">
-
- <TextView android:id="@+id/headerText"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="22sp"/>
-
- </ScrollView>
-
- </RelativeLayout>
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+ </ScrollView>
+
+ <!-- footer message -->
+ <TextView android:id="@+id/footerText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="0.6"/>
+
+ <!-- lock pattern widget -->
+ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+ android:layout_width="354dip"
+ android:layout_height="354dip"
+ aspect="square"/>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:gravity="center"
android:layout_marginTop="96dip">
<TextView android:id="@+id/headerText"
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
</ScrollView>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
- android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone"/>
<!-- bottom: lock pattern -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:gravity="center"
android:layout_marginTop="96dip">
<TextView android:id="@+id/headerText"
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
</ScrollView>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
<!-- bottom: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:padding="8dip"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:attr/textColorSecondary"
android:text="@string/unlock_backup_info_summary"
/>
\ No newline at end of file
<!-- Do not translate. -->
<string name="lockpattern_need_to_unlock_wrong_footer" />
<!-- Security & location settings screen, change unlock pattern screen instruction on top of screen. This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
- <string name="lockpattern_recording_intro_header">Draw an unlock pattern</string>
+ <string name="lockpattern_recording_intro_header">Draw an unlock pattern:</string>
<!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen. We are telling them to press the menu button to see more options or help. -->
<string name="lockpattern_recording_intro_footer">Press Menu for help.</string>
<!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->