diff options
| -rw-r--r-- | res/layout/choose_lock_pattern.xml | 64 |
1 files changed, 36 insertions, 28 deletions
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml index b4472ba..78ab8b4 100644 --- a/res/layout/choose_lock_pattern.xml +++ b/res/layout/choose_lock_pattern.xml @@ -21,39 +21,49 @@ android:layout_height="fill_parent" android:background="@color/black"> - <TextView android:id="@+id/headerText" + <!-- takes up all space above button bar at bottom --> + <LinearLayout + android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="0dip" - android:layout_weight="1" - android:gravity="center" - android:textSize="18sp"/> - - <View - android:background="@*android:drawable/code_lock_top" - android:layout_width="fill_parent" - android:layout_height="2dip" /> - <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - <View - android:background="@*android:drawable/code_lock_bottom" - android:layout_width="fill_parent" - android:layout_height="8dip" /> - - <!-- message just above the button bar --> - <TextView android:id="@+id/footerText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:textSize="14sp"/> - - <!-- confirm / restart buttons --> + android:layout_weight="1"> + + <TextView android:id="@+id/headerText" + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1" + android:gravity="center" + android:textSize="18sp"/> + + <View + android:background="@*android:drawable/code_lock_top" + android:layout_width="fill_parent" + android:layout_height="2dip" /> + <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <!-- bottom line looks bad when button bar is their too, omit in this case --> + <!--View + android:background="@*android:drawable/code_lock_bottom" + android:layout_width="fill_parent" + android:layout_height="8dip" /--> + + <TextView android:id="@+id/footerText" + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1" + android:gravity="center" + android:textSize="14sp"/> + + </LinearLayout> + + <LinearLayout style="@android:style/ButtonBar" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> - <!-- left button: skip, or retry --> <Button android:id="@+id/footerLeftButton" android:layout_height="wrap_content" android:layout_width="140dip" @@ -61,14 +71,12 @@ android:singleLine="true" android:text="@string/lockpattern_restart_button_text"/> - <!-- Placeholder to get blank space between the two buttons --> <View android:visibility="invisible" android:layout_height="0dip" android:layout_width="1dip" android:layout_weight="1" /> - <!-- right button: confirm or ok --> <Button android:id="@+id/footerRightButton" android:layout_height="wrap_content" android:layout_width="140dip" |