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

Merge change 21021

Browse Source 
* changes:
  Improve layout of lock tutorial, especially improved for sholes.
This commit is contained in:
Android (Google) Code Review
2009-08-12 17:00:57 -07:00
parent fdfb90f9e8 b732a2848e
commit 509caaf68d
1 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/layout/choose_lock_pattern.xml
View File

@@ -21,6 +21,13 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@color/black"> android:background="@color/black">
<!-- 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">
<TextView android:id="@+id/headerText" <TextView android:id="@+id/headerText"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dip" android:layout_height="0dip"
@@ -35,25 +42,28 @@
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<View
<!-- bottom line looks bad when button bar is their too, omit in this case -->
<!--View
android:background="@*android:drawable/code_lock_bottom" android:background="@*android:drawable/code_lock_bottom"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="8dip" /> android:layout_height="8dip" /-->
<!-- message just above the button bar -->
<TextView android:id="@+id/footerText" <TextView android:id="@+id/footerText"
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="0dip"
android:layout_gravity="center_horizontal" android:layout_weight="1"
android:gravity="center"
android:textSize="14sp"/> android:textSize="14sp"/>
<!-- confirm / restart buttons --> </LinearLayout>
<LinearLayout style="@android:style/ButtonBar" <LinearLayout style="@android:style/ButtonBar"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!-- left button: skip, or retry -->
<Button android:id="@+id/footerLeftButton" <Button android:id="@+id/footerLeftButton"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="140dip" android:layout_width="140dip"
@@ -61,14 +71,12 @@
android:singleLine="true" android:singleLine="true"
android:text="@string/lockpattern_restart_button_text"/> android:text="@string/lockpattern_restart_button_text"/>
<!-- Placeholder to get blank space between the two buttons -->
<View <View
android:visibility="invisible" android:visibility="invisible"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_width="1dip" android:layout_width="1dip"
android:layout_weight="1" /> android:layout_weight="1" />
<!-- right button: confirm or ok -->
<Button android:id="@+id/footerRightButton" <Button android:id="@+id/footerRightButton"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="140dip" android:layout_width="140dip"