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

Merge branch 'readonly-p4-donut' into donut

Browse Source
This commit is contained in:
Jim Miller
2009-04-13 08:59:09 -07:00
committed by The Android Open Source Project
parent acabd05f1c bd092fc446
commit f56eb33665
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/layout/choose_lock_pattern_example.xml
View File

@@ -67,22 +67,24 @@
<Button android:id="@+id/skip_button"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_width="140dip"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/skip_button_label"
/>
<!-- Placeholder to get blank space between the two buttons -->
<View
android:visibility="invisible"
android:layout_height="0dip"
android:layout_width="0dip"
android:layout_weight="1"
/>
android:layout_width="1dip"
android:layout_weight="1" />
<Button android:id="@+id/next_button"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_width="140dip"
android:ellipsize="marquee"
android:singleLine="true"
android:drawableRight="@drawable/ic_btn_next"
android:drawablePadding="3dip"
android:text="@string/next_button_label"

18
res/layout/choose_lock_pattern_tutorial.xml
View File

@@ -59,24 +59,26 @@
<Button android:id="@+id/skip_button"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_width="140dip"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/skip_button_label"
/>
<!-- Placeholder to get blank space between the two buttons -->
<View
android:visibility="invisible"
android:layout_height="0dip"
android:layout_width="0dip"
android:layout_weight="1"
/>
android:layout_width="1dip"
android:layout_weight="1" />
<Button android:id="@+id/next_button"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_width="140dip"
android:drawableRight="@drawable/ic_btn_next"
android:drawablePadding="3dip"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/next_button_label"
/>